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 fb3d430bae374eba79700b834a12ba691d50fc75..f8d1c524d62136ed374b0969bc0d3bb224c83836 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 |
@@ -26,7 +26,7 @@ |
#include "chrome/test/base/testing_profile.h" |
#include "chrome/test/base/testing_profile_manager.h" |
#include "components/prefs/testing_pref_service.h" |
-#include "components/syncable_prefs/testing_pref_service_syncable.h" |
+#include "components/sync_preferences/testing_pref_service_syncable.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/test/test_browser_thread.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -242,7 +242,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabled) { |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateDisabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref( |
prefs::kCloudPrintEmail, |
@@ -259,7 +259,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabled) { |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateEnabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |
@@ -277,7 +277,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithPolicySetProxyDisabled) { |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateDisabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |
@@ -296,7 +296,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithPolicySetProxyEnabled) { |
MockServiceProcessControl::kServiceStateEnabled, false); |
service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations(); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |
@@ -314,7 +314,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenSetPolicy) { |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateDisabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref( |
prefs::kCloudPrintEmail, |
@@ -336,7 +336,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyEnabledThenSetPolicy) { |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateEnabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |
@@ -361,7 +361,7 @@ TEST_F(CloudPrintProxyPolicyTest, |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateDisabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |
@@ -383,7 +383,7 @@ TEST_F(CloudPrintProxyPolicyTest, |
MockServiceProcessControl::kServiceStateEnabled, false); |
service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations(); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |
@@ -403,7 +403,7 @@ TEST_F(CloudPrintProxyPolicyTest, StartWithNoPolicyProxyDisabledThenEnable) { |
service.GetMockServiceProcessControl()->SetConnectSuccessMockExpectations( |
MockServiceProcessControl::kServiceStateDisabled, false); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref( |
prefs::kCloudPrintEmail, |
@@ -427,7 +427,7 @@ TEST_F(CloudPrintProxyPolicyTest, |
MockServiceProcessControl::kServiceStateEnabled, false); |
service.GetMockServiceProcessControl()->SetWillBeDisabledExpectations(); |
- syncable_prefs::TestingPrefServiceSyncable* prefs = |
+ sync_preferences::TestingPrefServiceSyncable* prefs = |
profile_.GetTestingPrefService(); |
prefs->SetUserPref(prefs::kCloudPrintEmail, |
new base::StringValue(std::string())); |