chrome/browser/metrics/metrics_log_unittest.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/metrics/metrics_log_unittest.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/metrics/metrics_log_unittest.cc

diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc

index 639b62371257d75c6d8b95a2fd81893a77eb3435..6e085def35f9f93ea81ccfe18f6275d3bb2eb690 100644

--- a/chrome/browser/metrics/metrics_log_unittest.cc

+++ b/chrome/browser/metrics/metrics_log_unittest.cc

@@ -14,9 +14,9 @@

#include "chrome/browser/metrics/metrics_log.h"

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

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

-#include "chrome/common/metrics/variations/variations_util.h"

#include "chrome/common/metrics/proto/profiler_event.pb.h"

#include "chrome/common/metrics/proto/system_profile.pb.h"

+#include "chrome/common/metrics/variations/variations_util.h"

#include "chrome/common/pref_names.h"

#include "chrome/installer/util/google_update_settings.h"

#include "chrome/test/base/testing_pref_service.h"

@@ -50,7 +50,7 @@ class TestMetricsLog : public MetricsLog {

TestMetricsLog(const std::string& client_id, int session_id)

: MetricsLog(client_id, session_id),

brand_for_testing_(kBrandForTesting) {

- chrome::RegisterLocalState(&prefs_);

+ chrome::RegisterLocalState(prefs_.registry(), &prefs_);

#if defined(OS_CHROMEOS)

prefs_.SetInteger(prefs::kStabilityChildProcessCrashCount, 10);

« no previous file with comments | « chrome/browser/metrics/metrics_log.cc ('k') | chrome/browser/metrics/metrics_service.h » ('j') | no next file with comments »