Separate cert loading code from CertLibrary and move to src/chromeos

chrome/browser/chromeos/login/user_manager_unittest.cc

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..da53dcd28f4a474c0eb470faa8debd2c98fe2dad 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"
@@ -24,6 +23,7 @@
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/test/test_browser_thread.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;

[hashimoto, 2013/05/03 16:07:44]

nit: Do we need this using and gmock.h include?

@@ -39,11 +39,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.