Changes requested by gab for previously committed CLs.

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 315 matching lines @@
       make_scoped_refptr(
           new CommandLinePrefStore(CommandLine::ForCurrentProcess())));
   factory->set_read_error_callback(base::Bind(&HandleReadError));
   factory->set_user_prefs(user_pref_store);
 }
 
 // Initialize/update preference hash stores for all profiles but the one whose
 // path matches |ignored_profile_path|.
 void UpdateAllPrefHashStoresIfRequired(
     const base::FilePath& ignored_profile_path) {
-  if (GetSettingsEnforcementGroup() >= GROUP_ENFORCE_ALWAYS)
-    return;
   const ProfileInfoCache& profile_info_cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   const size_t n_profiles = profile_info_cache.GetNumberOfProfiles();
   for (size_t i = 0; i < n_profiles; ++i) {
     const base::FilePath profile_path =
         profile_info_cache.GetPathOfProfileAtIndex(i);
     if (profile_path != ignored_profile_path) {
       CreateProfilePrefStoreManager(profile_path)
           ->UpdateProfileHashStoreIfRequired(
               JsonPrefStore::GetTaskRunnerForFile(
@@ skipping 74 matching lines @@
 }
 
 void SchedulePrefHashStoresUpdateCheck(
     const base::FilePath& initial_profile_path) {
   if (!ProfilePrefStoreManager::kPlatformSupportsPreferenceTracking) {
     ProfilePrefStoreManager::ResetAllPrefHashStores(
         g_browser_process->local_state());
     return;
   }
 
+  if (GetSettingsEnforcementGroup() >= GROUP_ENFORCE_ALWAYS)
+    return;
+
   const int kDefaultPrefHashStoresUpdateCheckDelaySeconds = 55;
   BrowserThread::PostDelayedTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&UpdateAllPrefHashStoresIfRequired,
                    initial_profile_path),
         base::TimeDelta::FromSeconds(
             g_disable_delays_and_domain_check_for_testing ?
                 0 : kDefaultPrefHashStoresUpdateCheckDelaySeconds));
 }
@@ skipping 19 matching lines @@
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   ProfilePrefStoreManager::RegisterProfilePrefs(registry);
 }
 
 void RegisterPrefs(PrefRegistrySimple* registry) {
   ProfilePrefStoreManager::RegisterPrefs(registry);
 }
 
 }  // namespace chrome_prefs