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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/printing/cloud_print/cloud_print_proxy_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/prefs/session_startup_pref_unittest.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_url.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
index 68005ff8823b4622a07716e8bc401964a1ad8270..b7b969b6122978495e95e207e48ec4926abcd4d4 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
@@ -220,7 +220,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabled) {
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateDisabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(
MockServiceProcessControl::EnabledUserId()));
@@ -236,7 +236,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabled) {
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateEnabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
@@ -253,7 +253,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithPolicySetProxyDisabled) {
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateDisabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
@@ -271,7 +271,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithPolicySetProxyEnabled) {
MockServiceProcessControl::kServiceStateEnabled, false);
service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations();
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
@@ -288,7 +288,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenSetPolicy) {
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateDisabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(
MockServiceProcessControl::EnabledUserId()));
@@ -309,7 +309,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabledThenSetPolicy) {
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateEnabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
@@ -333,7 +333,7 @@ TEST_F(CloudPrintProxyPolicyTest,
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateDisabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
@@ -354,7 +354,7 @@ TEST_F(CloudPrintProxyPolicyTest,
MockServiceProcessControl::kServiceStateEnabled, false);
service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations();
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
@@ -373,7 +373,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenEnable) {
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations(
MockServiceProcessControl::kServiceStateDisabled, false);
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(
MockServiceProcessControl::EnabledUserId()));
@@ -397,7 +397,7 @@ TEST_F(CloudPrintProxyPolicyTest,
MockServiceProcessControl::kServiceStateEnabled, false);
service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations();
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
@@ -434,7 +434,7 @@ ProfileKeyedService* TestCloudPrintProxyServiceFactory(Profile* profile) {
}
TEST_F(CloudPrintProxyPolicyTest, StartupBrowserCreatorWithCommandLine) {
- TestingPrefService* prefs = profile_.GetTestingPrefService();
+ TestingPrefServiceSyncable* prefs = profile_.GetTestingPrefService();
prefs->SetUserPref(prefs::kCloudPrintEmail,
Value::CreateStringValue(std::string()));
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
« no previous file with comments | « chrome/browser/prefs/session_startup_pref_unittest.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698