Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/extensions/api/image_writer_private/test_utils.cc

Index: chrome/browser/extensions/api/image_writer_private/test_utils.cc
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
index 442b0410d2a3ac99082fbe0ede4b1a56130a66c6..b28e514a3d45e15c82014095deb2990f63f96375 100644
--- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc
+++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
@@ -6,7 +6,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_image_burner_client.h"
 #endif
 
@@ -161,20 +160,11 @@ void ImageWriterTestUtils::SetUp(bool is_browser_test) {
 
 #if defined(OS_CHROMEOS)
   if (!chromeos::DBusThreadManager::IsInitialized()) {
-    chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =
-        new chromeos::FakeDBusThreadManager;
-    fake_dbus_thread_manager->SetFakeClients();
+    scoped_ptr<chromeos::DBusThreadManagerTestHelper> dbus_helper =
+        chromeos::DBusThreadManager::InitializeForTesting();
     scoped_ptr<chromeos::ImageBurnerClient>
         image_burner_fake(new ImageWriterFakeImageBurnerClient());
-    fake_dbus_thread_manager->SetImageBurnerClient(image_burner_fake.Pass());
-
-    if (is_browser_test) {
-      chromeos::DBusThreadManager::SetInstanceForTesting(
-          fake_dbus_thread_manager);
-    } else {
-      chromeos::DBusThreadManager::InitializeForTesting(
-          fake_dbus_thread_manager);
-    }
+    dbus_helper->SetImageBurnerClient(image_burner_fake.Pass());
   }
 
   FakeDiskMountManager* disk_manager = new FakeDiskMountManager();