Revert 287689 "Add integration browser tests for settings harden..."

trunk/src/chrome/browser/prefs/chrome_pref_service_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 223 matching lines @@
     { chrome_prefs::internals::
           kSettingsEnforcementGroupEnforceAlwaysWithDSE,
       GROUP_ENFORCE_ALWAYS_WITH_DSE },
     { chrome_prefs::internals::
           kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE,
       GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE },
   };
 
   // Use the strongest enforcement setting in the absence of a field trial
   // config on Windows. Remember to update the OFFICIAL_BUILD section of
-  // extension_startup_browsertest.cc and pref_hash_browsertest.cc when updating
-  // the default value below.
+  // extension_startup_browsertest.cc when updating the default value below.
   // TODO(gab): Enforce this on all platforms.
   SettingsEnforcementGroup enforcement_group =
 #if defined(OS_WIN)
       GROUP_ENFORCE_DEFAULT;
 #else
       GROUP_NO_ENFORCEMENT;
 #endif
   bool group_determined_from_trial = false;
   base::FieldTrial* trial =
       base::FieldTrialList::Find(
@@ skipping 145 matching lines @@
   factory->set_read_error_callback(base::Bind(&HandleReadError));
   factory->set_user_prefs(user_pref_store);
 }
 
 }  // namespace
 
 namespace chrome_prefs {
 
 namespace internals {
 
-// Group modifications should be reflected in first_run_browsertest.cc and
-// pref_hash_browsertest.cc.
 const char kSettingsEnforcementTrialName[] = "SettingsEnforcement";
 const char kSettingsEnforcementGroupNoEnforcement[] = "no_enforcement";
 const char kSettingsEnforcementGroupEnforceAlways[] = "enforce_always";
 const char kSettingsEnforcementGroupEnforceAlwaysWithDSE[] =
     "enforce_always_with_dse";
 const char kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE[] =
     "enforce_always_with_extensions_and_dse";
 
 }  // namespace internals
 
@@ skipping 91 matching lines @@
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   ProfilePrefStoreManager::RegisterProfilePrefs(registry);
 }
 
 void RegisterPrefs(PrefRegistrySimple* registry) {
   ProfilePrefStoreManager::RegisterPrefs(registry);
 }
 
 }  // namespace chrome_prefs