Fixed loader issue in unit tests caused by some test not using that mock and causing the library to appear already loaded in a failed state.

Review URL: http://codereview.chromium.org/1251001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42419 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
index 3a06a54..71a7f4d 100644
--- a/chrome/browser/chromeos/cros/cros_library.cc
+++ b/chrome/browser/chromeos/cros/cros_library.cc
@@ -114,9 +114,15 @@ CrosLibrary::TestApi* CrosLibrary::GetTestApi() {
 }
 
 void CrosLibrary::TestApi::SetLibraryLoader(LibraryLoader* loader) {
+  if (library_->library_loader_ == loader)
+    return;
   if (library_->library_loader_)
     delete library_->library_loader_;
   library_->library_loader_ = loader;
+  // Reset load flags when loader changes. Otherwise some tests are really not
+  // going to be happy.
+  library_->loaded_ = false;
+  library_->load_error_ = false;
 }
 
 void CrosLibrary::TestApi::SetCryptohomeLibrary(CryptohomeLibrary* library) {
diff --git a/chrome/browser/chromeos/login/google_authenticator_unittest.cc b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
index 89cddc6..8139abd 100644
--- a/chrome/browser/chromeos/login/google_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
@@ -67,6 +67,11 @@ class GoogleAuthenticatorTest : public ::testing::Test {
 
   // Tears down the test fixture.
   virtual void TearDown() {
+    // Prevent bogus gMock leak check from firing.
+    chromeos::CrosLibrary::TestApi* test_api =
+        chromeos::CrosLibrary::Get()->GetTestApi();
+    test_api->SetLibraryLoader(NULL);
+    test_api->SetCryptohomeLibrary(NULL);
   }
 
   unsigned char fake_hash_[32];