diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:45:47 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:45:47 +0000 |
| commit | b1de2c717ac103f2c66110510072ce4731e51015 (patch) | |
| tree | 6ece76e06f3118052d1913774d49fa71b8802fb6 /chrome_frame/test/net | |
| parent | e659eb915610370c828a64ae2d82519cc10c60e7 (diff) | |
| download | chromium_src-b1de2c717ac103f2c66110510072ce4731e51015.zip chromium_src-b1de2c717ac103f2c66110510072ce4731e51015.tar.gz chromium_src-b1de2c717ac103f2c66110510072ce4731e51015.tar.bz2 | |
Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.
This is a step towards removing registration methods from PrefService and simplifying its class hierarchy.
TBR=ben@chromium.org
BUG=155525
Review URL: https://chromiumcodereview.appspot.com/11741003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 24007f2..4640508 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,13 @@ 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()); + if (!browser_process_->local_state()->FindPreference( + prefs::kMetricsReportingEnabled)) { + registry->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false); + } } void FakeExternalTab::InitializePostThreadsCreated() { |