Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/apps/app_browsertest.cc

 // Copyright 2013 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 "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/launcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 34 matching lines @@
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/api/app_runtime.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #endif
 
 using apps::AppWindow;
 using apps::AppWindowRegistry;
 using content::WebContents;
 using web_modal::WebContentsModalDialogManager;
 
 namespace app_runtime = extensions::core_api::app_runtime;
 
@@ skipping 1158 matching lines @@
  public:
   RestartDeviceTest()
       : power_manager_client_(NULL),
         mock_user_manager_(NULL) {}
   virtual ~RestartDeviceTest() {}
 
   // PlatformAppBrowserTest overrides
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture();
 
-    chromeos::FakeDBusThreadManager* dbus_manager =
-        new chromeos::FakeDBusThreadManager;
-    dbus_manager->SetFakeClients();
     power_manager_client_ = new chromeos::FakePowerManagerClient;
-    dbus_manager->SetPowerManagerClient(
+    chromeos::DBusThreadManager::GetSetterForTesting()->SetPowerManagerClient(
         scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
-    chromeos::DBusThreadManager::SetInstanceForTesting(dbus_manager);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     PlatformAppBrowserTest::SetUpOnMainThread();
 
     mock_user_manager_ = new chromeos::MockUserManager;
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
 
     EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
@@ skipping 70 matching lines @@
         LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
     ASSERT_TRUE(extension);
     ASSERT_EQ(extension_id, extension->id());
 
     ExtensionApiTest::ResultCatcher result_catcher;
     EXPECT_TRUE(result_catcher.GetNextResult());
   }
 }
 
 }  // namespace extensions