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

Side by Side Diff: trunk/src/chrome/browser/sync/profile_sync_service_preference_unittest.cc

Issue 17610004: Revert 208315 "Make use of InvalidationService" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/json/json_string_value_serializer.h" 12 #include "base/json/json_string_value_serializer.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
16 #include "chrome/browser/invalidation/invalidation_service_factory.h"
17 #include "chrome/browser/prefs/pref_model_associator.h" 16 #include "chrome/browser/prefs/pref_model_associator.h"
18 #include "chrome/browser/prefs/scoped_user_pref_update.h" 17 #include "chrome/browser/prefs/scoped_user_pref_update.h"
19 #include "chrome/browser/signin/signin_manager.h" 18 #include "chrome/browser/signin/signin_manager.h"
20 #include "chrome/browser/signin/signin_manager_factory.h" 19 #include "chrome/browser/signin/signin_manager_factory.h"
21 #include "chrome/browser/signin/token_service_factory.h" 20 #include "chrome/browser/signin/token_service_factory.h"
22 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" 21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
23 #include "chrome/browser/sync/glue/generic_change_processor.h" 22 #include "chrome/browser/sync/glue/generic_change_processor.h"
24 #include "chrome/browser/sync/glue/sync_backend_host.h" 23 #include "chrome/browser/sync/glue/sync_backend_host.h"
25 #include "chrome/browser/sync/glue/ui_data_type_controller.h" 24 #include "chrome/browser/sync/glue/ui_data_type_controller.h"
26 #include "chrome/browser/sync/profile_sync_service_factory.h" 25 #include "chrome/browser/sync/profile_sync_service_factory.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 example_url1_("http://example.com/1"), 117 example_url1_("http://example.com/1"),
119 example_url2_("http://example.com/2"), 118 example_url2_("http://example.com/2"),
120 not_synced_preference_name_("nonsense_pref_name"), 119 not_synced_preference_name_("nonsense_pref_name"),
121 not_synced_preference_default_value_("default"), 120 not_synced_preference_default_value_("default"),
122 non_default_charset_value_("foo") {} 121 non_default_charset_value_("foo") {}
123 122
124 virtual void SetUp() { 123 virtual void SetUp() {
125 AbstractProfileSyncServiceTest::SetUp(); 124 AbstractProfileSyncServiceTest::SetUp();
126 profile_.reset(new TestingProfile()); 125 profile_.reset(new TestingProfile());
127 profile_->CreateRequestContext(); 126 profile_->CreateRequestContext();
128 invalidation::InvalidationServiceFactory::GetInstance()->
129 SetBuildOnlyFakeInvalidatorsForTest(true);
130 prefs_ = profile_->GetTestingPrefService(); 127 prefs_ = profile_->GetTestingPrefService();
131 128
132 prefs_->registry()->RegisterStringPref( 129 prefs_->registry()->RegisterStringPref(
133 not_synced_preference_name_.c_str(), 130 not_synced_preference_name_.c_str(),
134 not_synced_preference_default_value_, 131 not_synced_preference_default_value_,
135 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 132 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
136 } 133 }
137 134
138 virtual void TearDown() { 135 virtual void TearDown() {
139 profile_.reset(); 136 profile_.reset();
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 EXPECT_FALSE(pref->IsDefaultValue()); 682 EXPECT_FALSE(pref->IsDefaultValue());
686 // There should be no synced value. 683 // There should be no synced value.
687 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); 684 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
688 // Switch kHomePage back to unmanaged. 685 // Switch kHomePage back to unmanaged.
689 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); 686 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
690 // The original value should be picked up. 687 // The original value should be picked up.
691 EXPECT_TRUE(pref->IsDefaultValue()); 688 EXPECT_TRUE(pref->IsDefaultValue());
692 // There should still be no synced value. 689 // There should still be no synced value.
693 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); 690 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
694 } 691 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698