Merged FakedDBusThreadManager with DBusThreadManager.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #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;
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetIncognitoModeAvailability) {
   PrefService* pref_service = browser()->profile()->GetPrefs();
   pref_service->SetInteger(prefs::kIncognitoModeAvailability, 1);
 
   EXPECT_TRUE(RunComponentExtensionTest(
       "system/get_incognito_mode_availability")) << message_;
 }
 
 #if defined(OS_CHROMEOS)
 
 class GetUpdateStatusApiTest : public ExtensionApiTest {
  public:
   GetUpdateStatusApiTest() : fake_update_engine_client_(NULL) {}
 
   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(
+    chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(
         scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
-    chromeos::DBusThreadManager::SetInstanceForTesting(
-        fake_dbus_thread_manager);
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::TearDownInProcessBrowserTestFixture();
   }
 
  protected:
   chromeos::FakeUpdateEngineClient* fake_update_engine_client_;
 
  private:
@@ skipping 13 matching lines @@
   // The fake client returns the last status in this order.
   fake_update_engine_client_->PushLastStatus(status_not_available);
   fake_update_engine_client_->PushLastStatus(status_updating);
   fake_update_engine_client_->PushLastStatus(status_boot_needed);
 
   ASSERT_TRUE(RunComponentExtensionTest(
       "system/get_update_status")) << message_;
 }
 
 #endif