diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 02:39:50 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 02:39:50 +0000 |
| commit | e1792015ed792a1f274aa23a203d94216d2cffc6 (patch) | |
| tree | d44157a30239b432db5e4006bfa2d7cd3f44fa03 /chrome_frame | |
| parent | 26ec347f64d0fb270b578a08280a2fd38a293ef0 (diff) | |
| download | chromium_src-e1792015ed792a1f274aa23a203d94216d2cffc6.zip chromium_src-e1792015ed792a1f274aa23a203d94216d2cffc6.tar.gz chromium_src-e1792015ed792a1f274aa23a203d94216d2cffc6.tar.bz2 | |
Prepare the default profile and turn off some services before initializing extensions.
TEST=This is an attempt to reduce flakiness of Chrome Frame net tests.
BUG=none
TBR=ananta
Review URL: http://codereview.chromium.org/2051004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 37234d9..0809024 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -217,12 +217,13 @@ void FakeExternalTab::Initialize() { RenderProcessHost::set_run_renderer_in_process(true); - Profile* profile = g_browser_process->profile_manager()-> - GetDefaultProfile(FilePath(user_data())); + FilePath profile_path(ProfileManager::GetDefaultProfileDir(user_data())); + Profile* profile = g_browser_process->profile_manager()->GetProfile( + profile_path, false); PrefService* prefs = profile->GetPrefs(); DCHECK(prefs != NULL); - WebCacheManager::RegisterPrefs(prefs); + PrefService* local_state = browser_process_->local_state(); local_state->RegisterStringPref(prefs::kApplicationLocale, L""); local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false); |