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

Side by Side 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: Address feedback 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <cstdlib> 5 #include <cstdlib>
6 #include <cstring> 6 #include <cstring>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/prefs/testing_pref_service.h" 11 #include "base/prefs/testing_pref_service.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chromeos/cros/cros_library.h" 15 #include "chrome/browser/chromeos/cros/cros_library.h"
16 #include "chrome/browser/chromeos/cros/mock_cert_library.h"
17 #include "chrome/browser/chromeos/login/user.h" 16 #include "chrome/browser/chromeos/login/user.h"
18 #include "chrome/browser/chromeos/login/user_manager.h" 17 #include "chrome/browser/chromeos/login/user_manager.h"
19 #include "chrome/browser/chromeos/login/user_manager_impl.h" 18 #include "chrome/browser/chromeos/login/user_manager_impl.h"
20 #include "chrome/browser/chromeos/settings/cros_settings.h" 19 #include "chrome/browser/chromeos/settings/cros_settings.h"
21 #include "chrome/browser/chromeos/settings/cros_settings_names.h" 20 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
22 #include "chrome/browser/chromeos/settings/cros_settings_provider.h" 21 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
23 #include "chrome/browser/chromeos/settings/device_settings_service.h" 22 #include "chrome/browser/chromeos/settings/device_settings_service.h"
24 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" 23 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
25 #include "chrome/test/base/testing_browser_process.h" 24 #include "chrome/test/base/testing_browser_process.h"
26 #include "content/public/test/test_browser_thread.h" 25 #include "content/public/test/test_browser_thread.h"
26 #include "testing/gmock/include/gmock/gmock.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 28
29 using ::testing::AnyNumber; 29 using ::testing::AnyNumber;
hashimoto 2013/05/03 16:07:44 nit: Do we need this using and gmock.h include?
30 30
31 namespace chromeos { 31 namespace chromeos {
32 32
33 class UserManagerTest : public testing::Test { 33 class UserManagerTest : public testing::Test {
34 public: 34 public:
35 UserManagerTest() 35 UserManagerTest()
36 : message_loop_(MessageLoop::TYPE_UI), 36 : message_loop_(MessageLoop::TYPE_UI),
37 ui_thread_(content::BrowserThread::UI, &message_loop_), 37 ui_thread_(content::BrowserThread::UI, &message_loop_),
38 file_thread_(content::BrowserThread::FILE, &message_loop_) { 38 file_thread_(content::BrowserThread::FILE, &message_loop_) {
39 } 39 }
40 40
41 virtual void SetUp() OVERRIDE { 41 virtual void SetUp() OVERRIDE {
42 MockCertLibrary* mock_cert_library = new MockCertLibrary();
43 EXPECT_CALL(*mock_cert_library, LoadKeyStore()).Times(AnyNumber());
44 chromeos::CrosLibrary::Get()->GetTestApi()->SetCertLibrary(
45 mock_cert_library, true);
46
47 cros_settings_ = CrosSettings::Get(); 42 cros_settings_ = CrosSettings::Get();
48 43
49 // Replace the real DeviceSettingsProvider with a stub. 44 // Replace the real DeviceSettingsProvider with a stub.
50 device_settings_provider_ = 45 device_settings_provider_ =
51 cros_settings_->GetProvider(chromeos::kReportDeviceVersionInfo); 46 cros_settings_->GetProvider(chromeos::kReportDeviceVersionInfo);
52 EXPECT_TRUE(device_settings_provider_); 47 EXPECT_TRUE(device_settings_provider_);
53 EXPECT_TRUE( 48 EXPECT_TRUE(
54 cros_settings_->RemoveSettingsProvider(device_settings_provider_)); 49 cros_settings_->RemoveSettingsProvider(device_settings_provider_));
55 cros_settings_->AddSettingsProvider(&stub_settings_provider_); 50 cros_settings_->AddSettingsProvider(&stub_settings_provider_);
56 51
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 UserManager::Get()->UserLoggedIn( 187 UserManager::Get()->UserLoggedIn(
193 "user0@invalid.domain", "user0@invalid.domain", false); 188 "user0@invalid.domain", "user0@invalid.domain", false);
194 ResetUserManager(); 189 ResetUserManager();
195 190
196 const UserList* users = &UserManager::Get()->GetUsers(); 191 const UserList* users = &UserManager::Get()->GetUsers();
197 EXPECT_EQ(1U, users->size()); 192 EXPECT_EQ(1U, users->size());
198 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain"); 193 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
199 } 194 }
200 195
201 } // namespace chromeos 196 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698