Index: chrome/browser/prefs/chrome_pref_service_factory.cc |
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc |
index 584801e026c13149816dcb437c71429a0fd8dd34..b2d5855adb514d0b74f1351972f323dd34e0cf19 100644 |
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc |
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc |
@@ -388,25 +388,6 @@ void PrepareFactory( |
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) { |
- 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( |
- profile_path, BrowserThread::GetBlockingPool())); |
- } |
- } |
-} |
- |
} // namespace |
namespace chrome_prefs { |
@@ -489,32 +470,6 @@ void DisableDelaysAndDomainCheckForTesting() { |
g_disable_delays_and_domain_check_for_testing = true; |
} |
-void SchedulePrefHashStoresUpdateCheck( |
- const base::FilePath& initial_profile_path) { |
- if (!ProfilePrefStoreManager::kPlatformSupportsPreferenceTracking) { |
- ProfilePrefStoreManager::ResetAllPrefHashStores( |
- g_browser_process->local_state()); |
- return; |
- } |
- |
- if (GetSettingsEnforcementGroup() >= GROUP_ENFORCE_ALWAYS) |
gab
2014/06/11 19:25:42
Also remove GROUP_ENFORCE_ON_LOAD which was the sa
erikwright (departed)
2014/06/11 21:08:36
Done. Are any experiment configuration changes req
gab
2014/06/11 21:39:29
Not immediately, we can remove enforce_on_load ent
|
- 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)); |
-} |
- |
-void ResetPrefHashStore(const base::FilePath& profile_path) { |
- CreateProfilePrefStoreManager(profile_path)->ResetPrefHashStore(); |
-} |
- |
bool InitializePrefsFromMasterPrefs( |
const base::FilePath& profile_path, |
const base::DictionaryValue& master_prefs) { |