Index: chrome/browser/chromeos/cros/cros_library.cc |
=================================================================== |
--- chrome/browser/chromeos/cros/cros_library.cc (revision 42415) |
+++ chrome/browser/chromeos/cros/cros_library.cc (working copy) |
@@ -114,9 +114,15 @@ |
} |
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) { |