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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 431973002: Add integration browser tests for settings hardening. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 "chrome/browser/prefs/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 factory->set_read_error_callback(base::Bind(&HandleReadError)); 405 factory->set_read_error_callback(base::Bind(&HandleReadError));
406 factory->set_user_prefs(user_pref_store); 406 factory->set_user_prefs(user_pref_store);
407 } 407 }
408 408
409 } // namespace 409 } // namespace
410 410
411 namespace chrome_prefs { 411 namespace chrome_prefs {
412 412
413 namespace internals { 413 namespace internals {
414 414
415 // Group modifications should be reflected in first_run_browsertest.cc and
416 // pref_hash_browsertest.cc.
415 const char kSettingsEnforcementTrialName[] = "SettingsEnforcement"; 417 const char kSettingsEnforcementTrialName[] = "SettingsEnforcement";
416 const char kSettingsEnforcementGroupNoEnforcement[] = "no_enforcement"; 418 const char kSettingsEnforcementGroupNoEnforcement[] = "no_enforcement";
417 const char kSettingsEnforcementGroupEnforceAlways[] = "enforce_always"; 419 const char kSettingsEnforcementGroupEnforceAlways[] = "enforce_always";
418 const char kSettingsEnforcementGroupEnforceAlwaysWithDSE[] = 420 const char kSettingsEnforcementGroupEnforceAlwaysWithDSE[] =
419 "enforce_always_with_dse"; 421 "enforce_always_with_dse";
420 const char kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE[] = 422 const char kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE[] =
421 "enforce_always_with_extensions_and_dse"; 423 "enforce_always_with_extensions_and_dse";
422 424
423 } // namespace internals 425 } // namespace internals
424 426
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 518
517 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 519 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
518 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 520 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
519 } 521 }
520 522
521 void RegisterPrefs(PrefRegistrySimple* registry) { 523 void RegisterPrefs(PrefRegistrySimple* registry) {
522 ProfilePrefStoreManager::RegisterPrefs(registry); 524 ProfilePrefStoreManager::RegisterPrefs(registry);
523 } 525 }
524 526
525 } // namespace chrome_prefs 527 } // namespace chrome_prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698