summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 17:20:03 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 17:20:03 +0000
commit7e75e4a8d4bc9dda2944cb5381c819c6d0249ec9 (patch)
tree7236949d8c2717c3d53a0bbc718e5d082fa5e3e7 /chrome_frame
parent97abca8533441f0a2d065788b7c07f1d0025e06b (diff)
downloadchromium_src-7e75e4a8d4bc9dda2944cb5381c819c6d0249ec9.zip
chromium_src-7e75e4a8d4bc9dda2944cb5381c819c6d0249ec9.tar.gz
chromium_src-7e75e4a8d4bc9dda2944cb5381c819c6d0249ec9.tar.bz2
Drop more dependencies of ProfileKeyedService infrastructure on chrome.
This extracts AssertFactoriesBuilt code to a file that will stay in chrome. This is a resubmit of https://codereview.chromium.org/14967003/ TBR=erg BUG=227219 Review URL: https://codereview.chromium.org/14832006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 9f2c2eae..8e2a487 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -37,6 +37,7 @@
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"
#include "chrome/browser/process_singleton.h"
+#include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/common/chrome_constants.h"
@@ -917,6 +918,11 @@ const char* IEVersionToString(IEVersion version) {
content::BrowserMainParts* FakeContentBrowserClient::CreateBrowserMainParts(
const content::MainFunctionParams& parameters) {
+ // Normally this would happen during browser startup, but for tests
+ // we need to trigger creation of Profile-related services.
+ ChromeBrowserMainExtraPartsProfiles::
+ EnsureProfileKeyedServiceFactoriesBuilt();
+
// We never delete this, as the content module takes ownership.
//
// We must not construct this earlier, or we will have out-of-order