chrome/browser/prefs/browser_prefs.cc - Issue 90563003: Fix a race condition in preference metric reporting.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 90563003: Fix a race condition in preference metric reporting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Also filter 'empty loads' as in new run or corrupted pref file scenarios. Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index d6b9f732ba733e671b42d3329e99b40d631dc815..1f370ae84b842c7e89a89c2460003e0bf4f38842 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -56,7 +56,7 @@

#include "chrome/browser/pepper_flash_settings_manager.h"

#include "chrome/browser/plugins/plugin_finder.h"

#include "chrome/browser/prefs/incognito_mode_prefs.h"

-#include "chrome/browser/prefs/pref_metrics_service.h"

+#include "chrome/browser/prefs/pref_hash_store_impl.h"

#include "chrome/browser/prefs/pref_service_syncable.h"

#include "chrome/browser/prefs/session_startup_pref.h"

#include "chrome/browser/printing/cloud_print/cloud_print_url.h"

@@ -236,7 +236,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

MetricsLog::RegisterPrefs(registry);

MetricsService::RegisterPrefs(registry);

metrics::CachingPermutedEntropyProvider::RegisterPrefs(registry);

- PrefMetricsService::RegisterPrefs(registry);

+ PrefHashStoreImpl::RegisterPrefs(registry);

PrefProxyConfigTrackerImpl::RegisterPrefs(registry);

ProfileInfoCache::RegisterPrefs(registry);

profiles::RegisterPrefs(registry);