Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/extensions/api/system_private/system_private_apitest.cc

Index: chrome/browser/extensions/api/system_private/system_private_apitest.cc
diff --git a/chrome/browser/extensions/api/system_private/system_private_apitest.cc b/chrome/browser/extensions/api/system_private/system_private_apitest.cc
index f24209546a12ebb2d91d1b569d30fb3b520d8db4..70f78e0b4ef9fd6581b2cedf6ba49db493a14017 100644
--- a/chrome/browser/extensions/api/system_private/system_private_apitest.cc
+++ b/chrome/browser/extensions/api/system_private/system_private_apitest.cc
@@ -9,7 +9,7 @@
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_CHROMEOS)
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_update_engine_client.h"
 
 using chromeos::UpdateEngineClient;
@@ -31,14 +31,10 @@ class GetUpdateStatusApiTest : public ExtensionApiTest {
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
-    chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =
-        new chromeos::FakeDBusThreadManager;
-    fake_dbus_thread_manager->SetFakeClients();
     fake_update_engine_client_ = new chromeos::FakeUpdateEngineClient;
-    fake_dbus_thread_manager->SetUpdateEngineClient(
-        scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
-    chromeos::DBusThreadManager::SetInstanceForTesting(
-        fake_dbus_thread_manager);
+    chromeos::DBusThreadManager::GetDBusThreadManagerTestHelper()->
+        SetUpdateEngineClient(
+            scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {