Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc

Index: chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc
diff --git a/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc
index ca6b24f3472c82c764c7634a7c8fe44a95547053..a61e0b840791b72ca218942b029782846acbbeaf 100644
--- a/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.cc
@@ -8,7 +8,7 @@
 #include "base/files/file_path.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_switches.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_debug_daemon_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension_builder.h"
@@ -68,16 +68,11 @@ class LogPrivateApiTest : public ExtensionApiTest {
   virtual ~LogPrivateApiTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =
-        new chromeos::FakeDBusThreadManager;
-    fake_dbus_thread_manager->SetFakeClients();
     base::FilePath tar_file_path =
         test_data_dir_.Append("log_private/dump_logs/system_logs.tar");
-    fake_dbus_thread_manager->SetDebugDaemonClient(
-        scoped_ptr<chromeos::DebugDaemonClient>(
+    chromeos::DBusThreadManager::GetDBusThreadManagerTestHelper()->
+        SetDebugDaemonClient(scoped_ptr<chromeos::DebugDaemonClient>(
             new TestDebugDaemonClient(tar_file_path)));
-    chromeos::DBusThreadManager::SetInstanceForTesting(
-        fake_dbus_thread_manager);
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
   }