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

Unified Diff: chrome/browser/chromeos/login/user_manager_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/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc
index 7fc9ce6ea52d2bb6502953c116875c8657ab8871..1e65fe0ea865c30cac5d1804774702971b9415f6 100644
--- a/chrome/browser/chromeos/login/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc
@@ -13,7 +13,6 @@
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/mock_cert_library.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/user_manager_impl.h"
@@ -26,8 +25,6 @@
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-using ::testing::AnyNumber;
-
namespace chromeos {
class UserManagerTest : public testing::Test {
@@ -39,11 +36,6 @@ class UserManagerTest : public testing::Test {
}
virtual void SetUp() OVERRIDE {
- MockCertLibrary* mock_cert_library = new MockCertLibrary();
- EXPECT_CALL(*mock_cert_library, LoadKeyStore()).Times(AnyNumber());
- chromeos::CrosLibrary::Get()->GetTestApi()->SetCertLibrary(
- mock_cert_library, true);
-
cros_settings_ = CrosSettings::Get();
// Replace the real DeviceSettingsProvider with a stub.
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/network_login_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698