chrome_frame/test/net/fake_external_tab.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_frame/test/net/fake_external_tab.cc

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

Patch Set: Address review comments, fix build and test issues. Created 7 years, 11 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

« chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc ('K') | « chrome/test/reliability/page_load_test.cc ('k') | chrome_frame/test/reliability/page_load_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome_frame/test/net/fake_external_tab.cc

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc

index 24007f2191c1a9900d9f6d2f2b3881963b3decae..41ffb2d24f7a099dc4f93ef18281e60f0b874dd2 100644

--- a/chrome_frame/test/net/fake_external_tab.cc

+++ b/chrome_frame/test/net/fake_external_tab.cc

@@ -33,6 +33,7 @@

#include "chrome/browser/automation/automation_provider_list.h"

#include "chrome/browser/chrome_content_browser_client.h"

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

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

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

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

#include "chrome/browser/process_singleton.h"

@@ -516,8 +517,10 @@ void FakeExternalTab::Initialize() {

content::RenderProcessHost::SetRunRendererInProcess(true);

- browser_process_->local_state()->RegisterBooleanPref(

- prefs::kMetricsReportingEnabled, false);

+ // TODO(joi): Registration should be done up front via browser_prefs.cc

+ scoped_refptr<PrefRegistrySimple> registry = static_cast<PrefRegistrySimple*>(

+ browser_process_->local_state()->DeprecatedGetPrefRegistry());

+ registry->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);

}

void FakeExternalTab::InitializePostThreadsCreated() {