Fixes for handling of MockDBusThreadManager::GetSystemBus().

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/file_path.h"
 #include "base/file_util.h"
@@ skipping 299 matching lines @@
             SetAndResolveState(auth_, state_.release()));
 }
 
 TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) {
   FailOnLoginSuccess();  // Set failing on success as the default...
   LoginFailure failure = LoginFailure(LoginFailure::OWNER_REQUIRED);
   ExpectLoginFailure(failure);
 
   MockDBusThreadManager* mock_dbus_thread_manager =
       new MockDBusThreadManager;
+  EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())
+      .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
   DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
   EXPECT_CALL(*mock_dbus_thread_manager->mock_cryptohome_client(), Unmount(_))
       .WillOnce(DoAll(SetArgPointee<0>(true), Return(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);
@@ skipping 420 matching lines @@
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
       .WillOnce(Return(std::string()))
       .RetiresOnSaturation();
 
   auth_->AuthenticateToUnlock(username_, "");
   message_loop_.Run();
 }
 
 }  // namespace chromeos