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

Side by Side Diff: chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc

Issue 1102733002: Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs-add-reg-funcs
Patch Set: Created 5 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/prefs/mock_pref_change_callback.h" 9 #include "base/prefs/mock_pref_change_callback.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 content_settings_(ContentSettingsService::Get(&profile_)), 102 content_settings_(ContentSettingsService::Get(&profile_)),
103 test_preference_api_(&prefs_, content_settings_) { 103 test_preference_api_(&prefs_, content_settings_) {
104 prefs_.prefs()->AddObserver(content_settings_); 104 prefs_.prefs()->AddObserver(content_settings_);
105 } 105 }
106 106
107 ExtensionControlledPrefsTest::~ExtensionControlledPrefsTest() { 107 ExtensionControlledPrefsTest::~ExtensionControlledPrefsTest() {
108 } 108 }
109 109
110 void ExtensionControlledPrefsTest::RegisterPreferences( 110 void ExtensionControlledPrefsTest::RegisterPreferences(
111 user_prefs::PrefRegistrySyncable* registry) { 111 user_prefs::PrefRegistrySyncable* registry) {
112 registry->RegisterStringPref( 112 registry->RegisterStringPref(kPref1, kDefaultPref1);
113 kPref1, kDefaultPref1, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 113 registry->RegisterStringPref(kPref2, kDefaultPref2);
114 registry->RegisterStringPref( 114 registry->RegisterStringPref(kPref3, kDefaultPref3);
115 kPref2, kDefaultPref2, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 115 registry->RegisterStringPref(kPref4, kDefaultPref4);
116 registry->RegisterStringPref(
117 kPref3, kDefaultPref3, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
118 registry->RegisterStringPref(
119 kPref4, kDefaultPref4, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
120 } 116 }
121 117
122 void ExtensionControlledPrefsTest::InstallExtensionControlledPref( 118 void ExtensionControlledPrefsTest::InstallExtensionControlledPref(
123 Extension* extension, 119 Extension* extension,
124 const std::string& key, 120 const std::string& key,
125 base::Value* value) { 121 base::Value* value) {
126 EnsureExtensionInstalled(extension); 122 EnsureExtensionInstalled(extension);
127 test_preference_api_.SetExtensionControlledPref( 123 test_preference_api_.SetExtensionControlledPref(
128 extension->id(), key, kExtensionPrefsScopeRegular, value); 124 extension->id(), key, kExtensionPrefsScopeRegular, value);
129 } 125 }
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 EXPECT_EQ(kDefaultPref1, actual); 469 EXPECT_EQ(kDefaultPref1, actual);
474 } 470 }
475 } 471 }
476 472
477 private: 473 private:
478 int iteration_; 474 int iteration_;
479 }; 475 };
480 TEST_F(ControlledPrefsDisableExtensions, ControlledPrefsDisableExtensions) { } 476 TEST_F(ControlledPrefsDisableExtensions, ControlledPrefsDisableExtensions) { }
481 477
482 } // namespace extensions 478 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698