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

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

Issue 14522013: Separate cert loading code from CertLibrary and move to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 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 80ee5e32de761934edd87e137a1e74a7e0475412..65e1ae38d6e38a82122ca1d63b438daf9183ec6a 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -13,7 +13,6 @@
#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/login/mock_login_status_consumer.h"
#include "chrome/browser/chromeos/login/mock_url_fetchers.h"
#include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ -77,16 +76,9 @@ class ParallelAuthenticatorTest : public testing::Test {
mock_caller_ = new cryptohome::MockAsyncMethodCaller;
cryptohome::AsyncMethodCaller::InitializeForTesting(mock_caller_);
- chromeos::CrosLibrary::TestApi* test_api =
- chromeos::CrosLibrary::Get()->GetTestApi();
-
mock_cryptohome_library_ .reset(new MockCryptohomeLibrary());
CryptohomeLibrary::SetForTest(mock_cryptohome_library_.get());
- 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_);
@@ -222,7 +214,6 @@ class ParallelAuthenticatorTest : public testing::Test {
ScopedTestCrosSettings test_cros_settings_;
// Mocks, destroyed by CrosLibrary class.
- MockCertLibrary* mock_cert_library_;
ScopedUserManagerEnabler user_manager_enabler_;
scoped_ptr<MockCryptohomeLibrary> mock_cryptohome_library_;
« no previous file with comments | « chrome/browser/chromeos/login/parallel_authenticator.cc ('k') | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698