ChromeOS: Remove MockDBusThreadManager.

chrome/browser/chromeos/login/parallel_authenticator_unittest.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 "chrome/browser/chromeos/login/parallel_authenticator.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 35 matching lines @@
 class ParallelAuthenticatorTest : public testing::Test {
  public:
   ParallelAuthenticatorTest()
       : username_("me@nowhere.org"),
         password_("fakepass"),
         hash_ascii_(ParallelAuthenticator::HashPassword(
             password_,
             SystemSaltGetter::ConvertRawSaltToHexString(
                 FakeCryptohomeClient::GetStubSystemSalt()))),
         user_manager_enabler_(new MockUserManager),
-        mock_caller_(NULL),
-        fake_dbus_thread_manager_(new FakeDBusThreadManager) {
+        mock_caller_(NULL) {
   }
 
   virtual ~ParallelAuthenticatorTest() {
     DCHECK(!mock_caller_);
   }
 
   virtual void SetUp() {
     CommandLine::ForCurrentProcess()->AppendSwitch(switches::kLoginManager);
 
     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_);
     state_.reset(new TestAttemptState(UserContext(username_,
                                                   password_,
                                                   std::string()),
                                       "",
                                       "",
                                       User::USER_TYPE_REGULAR,
                                       false));
@@ skipping 111 matching lines @@
   ScopedDeviceSettingsTestHelper device_settings_test_helper_;
   ScopedTestCrosSettings test_cros_settings_;
 
   ScopedUserManagerEnabler user_manager_enabler_;
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
 
   MockConsumer consumer_;
   scoped_refptr<ParallelAuthenticator> auth_;
   scoped_ptr<TestAttemptState> state_;
-  FakeDBusThreadManager* fake_dbus_thread_manager_;
+  FakeCryptohomeClient* fake_cryptohome_client_;
 };
 
 TEST_F(ParallelAuthenticatorTest, OnLoginSuccess) {
   EXPECT_CALL(consumer_, OnLoginSuccess(UserContext(username_,
                                                     password_,
                                                     std::string(),
                                                     username_hash_,
                                                     true /* using oauth */)))
       .Times(1)
       .RetiresOnSaturation();
@@ skipping 68 matching lines @@
   state_->PresetCryptohomeStatus(true, cryptohome::MOUNT_ERROR_NONE);
   EXPECT_EQ(ParallelAuthenticator::OFFLINE_LOGIN,
             SetAndResolveState(auth_.get(), state_.release()));
 }
 
 TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) {
   FailOnLoginSuccess();  // Set failing on success as the default...
   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;
   // Set up state as though a cryptohome mount attempt has occurred
   // and succeeded but we are in safe mode and the current user is not owner.
   state_->PresetCryptohomeStatus(true, cryptohome::MOUNT_ERROR_NONE);
   SetOwnerState(false, false);
   // Remove the real DeviceSettingsProvider and replace it with a stub.
   device_settings_provider =
       CrosSettings::Get()->GetProvider(chromeos::kReportDeviceVersionInfo);
@@ skipping 299 matching lines @@
       .Times(1)
       .RetiresOnSaturation();
 
   auth_->AuthenticateToUnlock(UserContext(username_,
                                           std::string(),
                                           std::string()));
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace chromeos