ChromeOS: Remove MockDBusThreadManager.

- Extends FakeDBusThreadManager about DBusClient setters.
- Removes default initialization of DBusClients from FakeDBusThreadManager.
- Replaces all occurrences of MockDBusThreadManager in tests by FakeDBusThreadManager.
- Every test now creates exactly the DBusClients that are required.
- Removes all references to Fake/Stub implementations from the DBusThreadManagerImpl used for production.

Depends on:
https://codereview.chromium.org/50243005/

BUG=275286
TBR=miket@chromium.org,mkwst@chromium.org,rtenneti@chromium.org

Review URL: https://codereview.chromium.org/49773003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234172 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 75 insertions, 51 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
index 45f3780..f501825 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
@@ -151,9 +151,9 @@ class InputMethodManagerImplTest :  public testing::Test {
   // Helper function to initialize IBus bus connection for testing. Do not use
   // ibus related mocks before calling this function.
   void InitIBusBus() {
-    fake_dbus_thread_manager_->InitIBusBus("dummy address",
-                                           base::Bind(&base::DoNothing));
-    mock_ibus_client_ = fake_dbus_thread_manager_->mock_ibus_client();
+    mock_ibus_client_ = new MockIBusClient;
+    fake_dbus_thread_manager_->SetIBusClient(
+        scoped_ptr<IBusClient>(mock_ibus_client_));
     mock_ibus_daemon_controller_->EmulateConnect();
   }
 
diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
index d956d39..ebd8f25 100644
--- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc
+++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
@@ -47,10 +47,11 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest {
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     // Redirect session_manager DBus calls to FakeSessionManagerClient.
-    FakeDBusThreadManager* dbus_thread_manager =
-        new FakeDBusThreadManager();
-    session_manager_client_ =
-        dbus_thread_manager->fake_session_manager_client();
+    FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager;
+    dbus_thread_manager->SetFakeClients();
+    session_manager_client_ = new FakeSessionManagerClient;
+    dbus_thread_manager->SetSessionManagerClient(
+        scoped_ptr<SessionManagerClient>(session_manager_client_));
     DBusThreadManager::InitializeForTesting(dbus_thread_manager);
     session_manager_client_->StartSession(kUserId1);
   }
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 465b33e..4abf5b8 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -204,7 +204,7 @@ class LoginUtilsTest : public testing::Test,
     // DBusThreadManager should be initialized before io_thread_state_, as
     // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl,
     // which is part of io_thread_state_.
-    DBusThreadManager::InitializeForTesting(&fake_dbus_thread_manager_);
+    DBusThreadManager::InitializeWithStub();
 
     SystemSaltGetter::Initialize();
     LoginState::Initialize();
@@ -467,7 +467,6 @@ class LoginUtilsTest : public testing::Test,
   scoped_ptr<content::TestBrowserThread> io_thread_;
   scoped_ptr<IOThread> io_thread_state_;
 
-  FakeDBusThreadManager fake_dbus_thread_manager_;
   input_method::MockInputMethodManager* mock_input_method_manager_;
   disks::MockDiskMountManager mock_disk_mount_manager_;
   net::TestURLFetcherFactory test_url_fetcher_factory_;
@@ -478,7 +477,6 @@ class LoginUtilsTest : public testing::Test,
 
   policy::BrowserPolicyConnector* connector_;
 
-  // Initialized after |fake_dbus_thread_manager_| is set up.
   scoped_ptr<ScopedTestDeviceSettingsService> test_device_settings_service_;
   scoped_ptr<ScopedTestCrosSettings> test_cros_settings_;
   scoped_ptr<ScopedTestUserManager> test_user_manager_;
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index 8b8ab4e..2bcf243 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -53,8 +53,7 @@ class ParallelAuthenticatorTest : public testing::Test {
             SystemSaltGetter::ConvertRawSaltToHexString(
                 FakeCryptohomeClient::GetStubSystemSalt()))),
         user_manager_enabler_(new MockUserManager),
-        mock_caller_(NULL),
-        fake_dbus_thread_manager_(new FakeDBusThreadManager) {
+        mock_caller_(NULL) {
   }
 
   virtual ~ParallelAuthenticatorTest() {
@@ -67,8 +66,12 @@ class ParallelAuthenticatorTest : public testing::Test {
     mock_caller_ = new cryptohome::MockAsyncMethodCaller;
     cryptohome::AsyncMethodCaller::InitializeForTesting(mock_caller_);
 
-    // Ownership of fake_dbus_thread_manager_ is taken.
-    DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_);
+    FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
+    fake_cryptohome_client_ = new FakeCryptohomeClient;
+    fake_dbus_thread_manager->SetCryptohomeClient(
+        scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));
+    DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
+
     SystemSaltGetter::Initialize();
 
     auth_ = new ParallelAuthenticator(&consumer_);
@@ -200,7 +203,7 @@ class ParallelAuthenticatorTest : public testing::Test {
   MockConsumer consumer_;
   scoped_refptr<ParallelAuthenticator> auth_;
   scoped_ptr<TestAttemptState> state_;
-  FakeDBusThreadManager* fake_dbus_thread_manager_;
+  FakeCryptohomeClient* fake_cryptohome_client_;
 };
 
 TEST_F(ParallelAuthenticatorTest, OnLoginSuccess) {
@@ -289,9 +292,7 @@ TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) {
   LoginFailure failure = LoginFailure(LoginFailure::OWNER_REQUIRED);
   ExpectLoginFailure(failure);
 
-  FakeCryptohomeClient* fake_cryptohome_client  =
-      fake_dbus_thread_manager_->fake_cryptohome_client();
-  fake_cryptohome_client->set_unmount_result(true);
+  fake_cryptohome_client_->set_unmount_result(true);
 
   CrosSettingsProvider* device_settings_provider;
   StubCrosSettingsProvider stub_settings_provider;
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index 0b3ad8b..a441577 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -116,12 +116,14 @@ class ScreenLockerTest : public InProcessBrowserTest {
 
  private:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    FakeDBusThreadManager* fake_dbus_thread_manager =
-        new FakeDBusThreadManager;
+    FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
+    fake_dbus_thread_manager->SetFakeClients();
+    fake_session_manager_client_ = new FakeSessionManagerClient;
+    fake_dbus_thread_manager->SetSessionManagerClient(
+        scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
     DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
+
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
-    fake_session_manager_client_ =
-        fake_dbus_thread_manager->fake_session_manager_client();
     zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
         ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   }
diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
index 94af181..e06fc9f 100644
--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
@@ -53,11 +53,12 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 
-    FakeDBusThreadManager* fake_dbus_thread_manager =
-        new FakeDBusThreadManager;
+    FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
+    fake_dbus_thread_manager->SetFakeClients();
+    fake_session_manager_client_ = new FakeSessionManagerClient;
+    fake_dbus_thread_manager->SetSessionManagerClient(
+        scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
     DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
-    fake_session_manager_client_ =
-        fake_dbus_thread_manager->fake_session_manager_client();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index 55915ab..a56d55e 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -44,12 +44,14 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     FakeDBusThreadManager* fake_dbus_thread_manager =
         new FakeDBusThreadManager;
+    fake_dbus_thread_manager->SetFakeClients();
+    fake_update_engine_client_ = new FakeUpdateEngineClient;
+    fake_dbus_thread_manager->SetUpdateEngineClient(
+        scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
+
     DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 
-    fake_update_engine_client_
-        = fake_dbus_thread_manager->fake_update_engine_client();
-
     // Setup network portal detector to return online state for both
     // ethernet and wifi networks. Ethernet is an active network by
     // default.
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index a7ea9ad..23e68ca 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -410,8 +410,10 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {
 
     FakeDBusThreadManager* fake_dbus_thread_manager =
         new FakeDBusThreadManager();
-    fake_session_manager_client_ =
-        fake_dbus_thread_manager->fake_session_manager_client();
+    fake_dbus_thread_manager->SetFakeClients();
+    fake_session_manager_client_ = new FakeSessionManagerClient;
+    fake_dbus_thread_manager->SetSessionManagerClient(
+        scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
     DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
   }
 
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
index 26065eb..eb8505c 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
@@ -72,8 +72,11 @@ void DevicePolicyCrosTestHelper::InstallOwnerKey() {
 }
 
 DevicePolicyCrosBrowserTest::DevicePolicyCrosBrowserTest()
-    : fake_dbus_thread_manager_(
-        new chromeos::FakeDBusThreadManager) {
+    : fake_dbus_thread_manager_(new chromeos::FakeDBusThreadManager),
+      fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {
+  fake_dbus_thread_manager_->SetFakeClients();
+  fake_dbus_thread_manager_->SetSessionManagerClient(
+      scoped_ptr<chromeos::SessionManagerClient>(fake_session_manager_client_));
 }
 
 DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() {
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
index afe39ba..c7b5036 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -69,7 +69,7 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
   }
 
   chromeos::FakeSessionManagerClient* session_manager_client() {
-    return fake_dbus_thread_manager_->fake_session_manager_client();
+    return fake_session_manager_client_;
   }
 
   DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); }
@@ -79,6 +79,7 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
 
   // FakeDBusThreadManager uses FakeSessionManagerClient.
   chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_;
+  chromeos::FakeSessionManagerClient* fake_session_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);
 };
diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
index c56e816..278309d 100644
--- a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
+++ b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
@@ -94,7 +94,8 @@ EnterpriseInstallAttributes::EnterpriseInstallAttributes(
     : device_locked_(false),
       registration_mode_(DEVICE_MODE_PENDING),
       cryptohome_client_(cryptohome_client),
-      weak_ptr_factory_(this) {}
+      weak_ptr_factory_(this) {
+}
 
 EnterpriseInstallAttributes::~EnterpriseInstallAttributes() {}
 
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index b1d556c..21d038e6 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -151,14 +151,15 @@ PowerPolicyBrowserTestBase::PowerPolicyBrowserTestBase()
 }
 
 void PowerPolicyBrowserTestBase::SetUpInProcessBrowserTestFixture() {
+  power_manager_client_ = new chromeos::FakePowerManagerClient;
+  fake_dbus_thread_manager()->SetPowerManagerClient(
+      scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
+
   DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
 
   // Initialize device policy.
   InstallOwnerKey();
   MarkAsEnterpriseOwned();
-
-  power_manager_client_ =
-      fake_dbus_thread_manager()->fake_power_manager_client();
 }
 
 void PowerPolicyBrowserTestBase::SetUpOnMainThread() {
diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
index d29045a..c14d41d 100644
--- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
+++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
@@ -39,6 +39,7 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest {
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     FakeDBusThreadManager* fake_dbus_thread_manager =
         new FakeDBusThreadManager;
+    fake_dbus_thread_manager->SetFakeClients();
     DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
   }
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index ea84d36..794dd45 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -62,10 +62,13 @@ class PowerPrefsTest : public testing::Test {
 
 PowerPrefsTest::PowerPrefsTest()
     : profile_manager_(TestingBrowserProcess::GetGlobal()),
-      power_policy_controller_(
-          fake_dbus_thread_manager_.GetPowerPolicyController()),
-      fake_power_manager_client_(
-          fake_dbus_thread_manager_.fake_power_manager_client()) {
+      power_policy_controller_(new PowerPolicyController),
+      fake_power_manager_client_(new FakePowerManagerClient) {
+  fake_dbus_thread_manager_.SetPowerManagerClient(
+      scoped_ptr<PowerManagerClient>(fake_power_manager_client_));
+  fake_dbus_thread_manager_.SetPowerPolicyController(
+      scoped_ptr<PowerPolicyController>(power_policy_controller_));
+  power_policy_controller_->Init(&fake_dbus_thread_manager_);
 }
 
 void PowerPrefsTest::SetUp() {
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory_unittest.cc
index e7d5f32..9758cd9 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory_unittest.cc
@@ -31,9 +31,11 @@ void CopyTokenServiceAndCount(
 class ScopedDeviceOAuth2TokenServiceFactorySetUp {
  public:
   ScopedDeviceOAuth2TokenServiceFactorySetUp()
-      : fake_dbus_manager_(new FakeDBusThreadManager) {
-    // Take ownership of fake_dbus_manager_.
-    DBusThreadManager::InitializeForTesting(fake_dbus_manager_);
+      : fake_cryptohome_client_(new FakeCryptohomeClient) {
+    FakeDBusThreadManager* fake_dbus_manager = new FakeDBusThreadManager;
+    fake_dbus_manager->SetCryptohomeClient(
+        scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));
+    DBusThreadManager::InitializeForTesting(fake_dbus_manager);
     SystemSaltGetter::Initialize();
     DeviceOAuth2TokenServiceFactory::Initialize();
   }
@@ -44,12 +46,12 @@ class ScopedDeviceOAuth2TokenServiceFactorySetUp {
     DBusThreadManager::Shutdown();
   }
 
-  FakeDBusThreadManager* fake_dbus_manager() {
-    return fake_dbus_manager_;
+  FakeCryptohomeClient* fake_cryptohome_client() {
+    return fake_cryptohome_client_;
   }
 
  private:
-  FakeDBusThreadManager* fake_dbus_manager_;
+  FakeCryptohomeClient* fake_cryptohome_client_;
 };
 
 }  // namespace
@@ -137,7 +139,7 @@ TEST_F(DeviceOAuth2TokenServiceFactoryTest, Get_MultipleCallers) {
 // Test a case where it failed to obtain the system salt.
 TEST_F(DeviceOAuth2TokenServiceFactoryTest, Get_NoSystemSalt) {
   ScopedDeviceOAuth2TokenServiceFactorySetUp scoped_setup;
-  scoped_setup.fake_dbus_manager()->fake_cryptohome_client()->
+  scoped_setup.fake_cryptohome_client()->
       set_system_salt(std::vector<uint8>());
 
   DeviceOAuth2TokenService* token_service = NULL;
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
index 4ea30aa..b655ddb 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
@@ -358,10 +358,15 @@ void AutomaticRebootManagerBasicTest::SetUp() {
 
   TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
   AutomaticRebootManager::RegisterPrefs(local_state_.registry());
+
   FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
+  power_manager_client_ = new FakePowerManagerClient;
+  dbus_manager->SetPowerManagerClient(
+      scoped_ptr<PowerManagerClient>(power_manager_client_));
+  update_engine_client_ = new FakeUpdateEngineClient;
+  dbus_manager->SetUpdateEngineClient(
+      scoped_ptr<UpdateEngineClient>(update_engine_client_));
   DBusThreadManager::InitializeForTesting(dbus_manager);
-  power_manager_client_ = dbus_manager->fake_power_manager_client();
-  update_engine_client_ = dbus_manager->fake_update_engine_client();
 
   EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
      .WillRepeatedly(ReturnPointee(&is_user_logged_in_));