Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

Issue 10574040: Remove chromeos::LibraryLoader (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ade4900a21394683ff294b08bc4a83019e089a76..55a187c30bcf2a0dd7d928dbedc1d6c880709047 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -15,7 +15,6 @@
#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"
@@ -77,14 +76,6 @@ class ParallelAuthenticatorTest : public testing::Test {
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);
@@ -109,7 +100,6 @@ class ParallelAuthenticatorTest : public testing::Test {
// 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();
@@ -224,7 +214,6 @@ class ParallelAuthenticatorTest : public testing::Test {
// Mocks, destroyed by CrosLibrary class.
MockCertLibrary* mock_cert_library_;
MockCryptohomeLibrary* mock_cryptohome_library_;
- MockLibraryLoader* loader_;
ScopedMockUserManagerEnabler mock_user_manager_;
cryptohome::MockAsyncMethodCaller* mock_caller_;
« no previous file with comments | « chrome/browser/chromeos/login/online_attempt_unittest.cc ('k') | chrome/browser/chromeos/login/signed_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698