ChromeOS: Remove MockDBusThreadManager.

chrome/browser/chromeos/settings/device_oauth2_token_service_factory_unittest.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 "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
@@ skipping 13 matching lines @@
     chromeos::DeviceOAuth2TokenService* in_token_service) {
   *out_token_service = in_token_service;
   ++(*counter);
 }
 
 // Sets up and tears down DeviceOAuth2TokenServiceFactory and its
 // dependencies. Also exposes FakeDBusThreadManager.
 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();
   }
 
   ~ScopedDeviceOAuth2TokenServiceFactorySetUp() {
     DeviceOAuth2TokenServiceFactory::Shutdown();
     SystemSaltGetter::Shutdown();
     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
 
 class DeviceOAuth2TokenServiceFactoryTest : public testing::Test {
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 // Test a case where Get() is called before the factory is initialized.
@@ skipping 67 matching lines @@
   EXPECT_TRUE(token_service3);
 
   // Make sure that token_service1,2,3 are the same one.
   EXPECT_EQ(token_service1, token_service2);
   EXPECT_EQ(token_service1, token_service3);
 }
 
 // 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;
   int counter = 0;
   DeviceOAuth2TokenServiceFactory::Get(
       base::Bind(&CopyTokenServiceAndCount, &token_service, &counter));
   // The callback will be run asynchronously.
   EXPECT_EQ(0, counter);
   EXPECT_FALSE(token_service);
 
   // This lets FakeCryptohomeClient return the system salt, which is empty.
   // NULL should be returned to the callback in this case.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, counter);
   EXPECT_FALSE(token_service);
 
   // Try it again, but the result should remain the same (NULL returned).
   DeviceOAuth2TokenServiceFactory::Get(
       base::Bind(&CopyTokenServiceAndCount, &token_service, &counter));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(2, counter);
   EXPECT_FALSE(token_service);
 }
 
 }  // namespace chromeos