| Index: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| index 77c1deb82c0e0e8cbfc87a53fb11640841694fd0..e8b60946682144d993dd4171cfd90af2abe843c7 100644
|
| --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| @@ -218,10 +218,8 @@ class ParallelAuthenticatorTest : public testing::Test {
|
| std::string username_hash_;
|
| std::string hash_ascii_;
|
|
|
| - ScopedDeviceSettingsTestHelper device_settings_test_helper_;
|
| -
|
| - // Initializes / shuts down a stub CrosLibrary.
|
| ScopedStubCrosEnabler stub_cros_enabler_;
|
| + ScopedDeviceSettingsTestHelper device_settings_test_helper_;
|
|
|
| // Mocks, destroyed by CrosLibrary class.
|
| MockCertLibrary* mock_cert_library_;
|
| @@ -333,8 +331,7 @@ TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) {
|
| LoginFailure failure = LoginFailure(LoginFailure::OWNER_REQUIRED);
|
| ExpectLoginFailure(failure);
|
|
|
| - MockDBusThreadManager* mock_dbus_thread_manager =
|
| - new MockDBusThreadManager;
|
| + 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);
|
|
|