Reland "Remove chromeos::LibraryLoader"

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"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_cert_library.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
-#include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
 #include "chrome/browser/chromeos/login/mock_login_status_consumer.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/test_attempt_state.h"
 #include "chrome/browser/chromeos/stub_cros_settings_provider.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
@@ skipping 41 matching lines @@
     DCHECK(!mock_caller_);
   }
 
   virtual void SetUp() {
     mock_caller_ = new cryptohome::MockAsyncMethodCaller;
     cryptohome::AsyncMethodCaller::InitializeForTesting(mock_caller_);
 
     chromeos::CrosLibrary::TestApi* test_api =
         chromeos::CrosLibrary::Get()->GetTestApi();
 
-    loader_ = new MockLibraryLoader();
-    ON_CALL(*loader_, Load(_))
-        .WillByDefault(Return(true));
-    EXPECT_CALL(*loader_, Load(_))
-        .Times(AnyNumber());
-
-    test_api->SetLibraryLoader(loader_, true);
-
     mock_cryptohome_library_ = new MockCryptohomeLibrary();
     test_api->SetCryptohomeLibrary(mock_cryptohome_library_, true);
 
     mock_cert_library_ = new MockCertLibrary();
     EXPECT_CALL(*mock_cert_library_, LoadKeyStore()).Times(AnyNumber());
     test_api->SetCertLibrary(mock_cert_library_, true);
 
     io_thread_.Start();
 
     auth_ = new ParallelAuthenticator(&consumer_);
     auth_->set_using_oauth(false);
     state_.reset(new TestAttemptState(username_,
                                       password_,
                                       hash_ascii_,
                                       "",
                                       "",
                                       false));
   }
 
   // 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, false);
     test_api->SetCryptohomeLibrary(NULL, false);
 
     cryptohome::AsyncMethodCaller::Shutdown();
     mock_caller_ = NULL;
   }
 
   FilePath PopulateTempFile(const char* data, int data_len) {
     FilePath out;
     FILE* tmp_file = file_util::CreateAndOpenTemporaryFile(&out);
     EXPECT_NE(tmp_file, static_cast<FILE*>(NULL));
@@ skipping 94 matching lines @@
   std::string username_;
   std::string password_;
   std::string hash_ascii_;
 
   // Initializes / shuts down a stub CrosLibrary.
   chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
 
   // Mocks, destroyed by CrosLibrary class.
   MockCertLibrary* mock_cert_library_;
   MockCryptohomeLibrary* mock_cryptohome_library_;
-  MockLibraryLoader* loader_;
   ScopedMockUserManagerEnabler mock_user_manager_;
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
 
   MockConsumer consumer_;
   scoped_refptr<ParallelAuthenticator> auth_;
   scoped_ptr<TestAttemptState> state_;
 };
 
 TEST_F(ParallelAuthenticatorTest, OnLoginSuccess) {
@@ skipping 523 matching lines @@
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_cryptohome_library_, HashPassword(_))
       .WillOnce(Return(std::string()))
       .RetiresOnSaturation();
 
   auth_->AuthenticateToUnlock(username_, "");
   message_loop_.Run();
 }
 
 }  // namespace chromeos