| OLD | NEW |
| 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 example_url0_("http://example.com/0"), | 117 example_url0_("http://example.com/0"), |
| 118 example_url1_("http://example.com/1"), | 118 example_url1_("http://example.com/1"), |
| 119 example_url2_("http://example.com/2"), | 119 example_url2_("http://example.com/2"), |
| 120 not_synced_preference_name_("nonsense_pref_name"), | 120 not_synced_preference_name_("nonsense_pref_name"), |
| 121 not_synced_preference_default_value_("default"), | 121 not_synced_preference_default_value_("default"), |
| 122 non_default_charset_value_("foo") {} | 122 non_default_charset_value_("foo") {} |
| 123 | 123 |
| 124 virtual void SetUp() { | 124 virtual void SetUp() { |
| 125 AbstractProfileSyncServiceTest::SetUp(); | 125 AbstractProfileSyncServiceTest::SetUp(); |
| 126 profile_.reset(new TestingProfile()); | 126 profile_.reset(new TestingProfile()); |
| 127 profile_->CreateRequestContext(); | |
| 128 invalidation::InvalidationServiceFactory::GetInstance()-> | 127 invalidation::InvalidationServiceFactory::GetInstance()-> |
| 129 SetBuildOnlyFakeInvalidatorsForTest(true); | 128 SetBuildOnlyFakeInvalidatorsForTest(true); |
| 130 prefs_ = profile_->GetTestingPrefService(); | 129 prefs_ = profile_->GetTestingPrefService(); |
| 131 | 130 |
| 132 prefs_->registry()->RegisterStringPref( | 131 prefs_->registry()->RegisterStringPref( |
| 133 not_synced_preference_name_.c_str(), | 132 not_synced_preference_name_.c_str(), |
| 134 not_synced_preference_default_value_, | 133 not_synced_preference_default_value_, |
| 135 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 134 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 136 } | 135 } |
| 137 | 136 |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 EXPECT_FALSE(pref->IsDefaultValue()); | 684 EXPECT_FALSE(pref->IsDefaultValue()); |
| 686 // There should be no synced value. | 685 // There should be no synced value. |
| 687 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); | 686 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); |
| 688 // Switch kHomePage back to unmanaged. | 687 // Switch kHomePage back to unmanaged. |
| 689 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); | 688 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); |
| 690 // The original value should be picked up. | 689 // The original value should be picked up. |
| 691 EXPECT_TRUE(pref->IsDefaultValue()); | 690 EXPECT_TRUE(pref->IsDefaultValue()); |
| 692 // There should still be no synced value. | 691 // There should still be no synced value. |
| 693 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); | 692 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); |
| 694 } | 693 } |
| OLD | NEW |