diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 19:22:39 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 19:22:39 +0000 |
commit | d91061d4e4bb1ce5c2ff597902daf68b4872cdc8 (patch) | |
tree | a8c99e1d64bf76bb9acd91d1eeaa7aa6499439cb | |
parent | 33c477b6420946bd37d3e5c18f63db2961bad4e4 (diff) | |
download | chromium_src-d91061d4e4bb1ce5c2ff597902daf68b4872cdc8.zip chromium_src-d91061d4e4bb1ce5c2ff597902daf68b4872cdc8.tar.gz chromium_src-d91061d4e4bb1ce5c2ff597902daf68b4872cdc8.tar.bz2 |
Fix uninitialized mock_cryptohome_library_
Use InitMockCryptohomeLibrary in LoginManagerViewTest
BUG=none
TEST=LoginManagerView test should pass.
Review URL: http://codereview.chromium.org/2027011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47175 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/chromeos/cros/cros_in_process_browser_test.cc | 1 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/login_manager_view_browsertest.cc | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc index 36fc43d..73d74f0 100644 --- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc +++ b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc @@ -25,6 +25,7 @@ using ::testing::_; CrosInProcessBrowserTest::CrosInProcessBrowserTest() : loader_(NULL), + mock_cryptohome_library_(NULL), mock_language_library_(NULL), mock_network_library_(NULL), mock_power_library_(NULL), diff --git a/chrome/browser/chromeos/login/login_manager_view_browsertest.cc b/chrome/browser/chromeos/login/login_manager_view_browsertest.cc index 12c1fa8..a4e7ba4 100644 --- a/chrome/browser/chromeos/login/login_manager_view_browsertest.cc +++ b/chrome/browser/chromeos/login/login_manager_view_browsertest.cc @@ -41,24 +41,20 @@ class LoginManagerViewTest : public WizardInProcessBrowserTest { .Times(1); test_api()->SetLoginLibrary(mock_login_library_, true); - mock_cryptohome_library_ = new MockCryptohomeLibrary(); + InitMockCryptohomeLibrary(); EXPECT_CALL(*mock_cryptohome_library_, IsMounted()) .Times(AnyNumber()) .WillRepeatedly((Return(true))); - test_api()->SetCryptohomeLibrary(mock_cryptohome_library_, true); - LoginUtils::Set(new MockLoginUtils(kUsername, kPassword)); } virtual void TearDownInProcessBrowserTestFixture() { WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); test_api()->SetLoginLibrary(NULL, false); - test_api()->SetCryptohomeLibrary(NULL, false); } private: MockLoginLibrary* mock_login_library_; - MockCryptohomeLibrary* mock_cryptohome_library_; DISALLOW_COPY_AND_ASSIGN(LoginManagerViewTest); }; |