diff options
Diffstat (limited to 'chrome/browser/sync')
3 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index 52e832b..b706f7d 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -21,6 +21,7 @@ #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" +#include "chrome/test/testing_pref_service.h" #include "chrome/test/testing_profile.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -50,7 +51,7 @@ class ProfileSyncServicePreferenceTest virtual void SetUp() { profile_.reset(new TestingProfile()); profile_->set_has_history_service(true); - prefs_ = profile_->GetPrefs(); + prefs_ = profile_->GetTestingPrefService(); prefs_->RegisterStringPref(not_synced_preference_name_.c_str(), not_synced_preference_default_value_); @@ -456,8 +457,8 @@ TEST_F(ProfileSyncServicePreferenceTest, DynamicManagedPreferences) { // Switch kHomePage to managed and set a different value. scoped_ptr<Value> managed_value( Value::CreateStringValue("http://example.com/managed")); - profile_->GetPrefs()->SetManagedPref(prefs::kHomePage, - managed_value->DeepCopy()); + profile_->GetTestingPrefService()->SetManagedPref( + prefs::kHomePage, managed_value->DeepCopy()); // Sync node should be gone. EXPECT_EQ(sync_api::kInvalidId, @@ -480,7 +481,7 @@ TEST_F(ProfileSyncServicePreferenceTest, DynamicManagedPreferences) { EXPECT_TRUE(managed_value->Equals(&GetPreferenceValue(prefs::kHomePage))); // Switch kHomePage back to unmanaged. - profile_->GetPrefs()->RemoveManagedPref(prefs::kHomePage); + profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); // Sync value should be picked up. EXPECT_TRUE(sync_value->Equals(&GetPreferenceValue(prefs::kHomePage))); diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 9d915c2..0f4a2ec 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -8,6 +8,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/gaia/token_service.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/sync/glue/data_type_manager.h" #include "chrome/browser/sync/glue/data_type_manager_mock.h" #include "chrome/browser/sync/profile_sync_factory_mock.h" diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 11bc2e2..29fcaa4 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "testing/gtest/include/gtest/gtest.h" +#include "base/file_util.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" @@ -14,6 +15,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/glue/change_processor.h" |