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

Unified Diff: chrome/browser/policy/user_policy_signin_service_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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
« no previous file with comments | « chrome/browser/policy/user_policy_signin_service_factory.cc ('k') | chrome/browser/prefs/browser_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/user_policy_signin_service_unittest.cc
diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc
index a1eb4505764399815e2e08e4b1e204adad9604a8..878c2b8ef68ef8a0b5a0f76235745b895a15efed 100644
--- a/chrome/browser/policy/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc
@@ -75,20 +75,21 @@ class UserPolicySigninServiceTest : public testing::Test {
g_browser_process->browser_policy_connector()->Init();
- local_state_.reset(new TestingPrefService);
+ local_state_.reset(new TestingPrefServiceSimple);
chrome::RegisterLocalState(local_state_.get());
static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(
local_state_.get());
// Create a testing profile with cloud-policy-on-signin enabled, and bring
// up a UserCloudPolicyManager with a MockUserCloudPolicyStore.
- scoped_ptr<TestingPrefService> prefs(new TestingPrefService());
+ scoped_ptr<TestingPrefServiceSyncable> prefs(
+ new TestingPrefServiceSyncable());
Profile::RegisterUserPrefs(prefs.get());
chrome::RegisterUserPrefs(prefs.get());
prefs->SetUserPref(prefs::kLoadCloudPolicyOnSignin,
Value::CreateBooleanValue(true));
TestingProfile::Builder builder;
- builder.SetPrefService(scoped_ptr<PrefService>(prefs.Pass()));
+ builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));
profile_ = builder.Build().Pass();
profile_->CreateRequestContext();
@@ -231,7 +232,7 @@ class UserPolicySigninServiceTest : public testing::Test {
// BrowserPolicyConnector).
MockDeviceManagementService* device_management_service_;
- scoped_ptr<TestingPrefService> local_state_;
+ scoped_ptr<TestingPrefServiceSimple> local_state_;
};
TEST_F(UserPolicySigninServiceTest, InitWhileSignedOut) {
« no previous file with comments | « chrome/browser/policy/user_policy_signin_service_factory.cc ('k') | chrome/browser/prefs/browser_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698