diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 03:04:44 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 03:04:44 +0000 |
| commit | eeb348e9eeb40b91c7e95e072118388d2b6610dc (patch) | |
| tree | b7e76801b5062d3c304645724157ec5319fdf29f /chrome/test/base/testing_profile.cc | |
| parent | 9a22457f69b4cddf6a360559f0663e51fc5ab9c5 (diff) | |
| download | chromium_src-eeb348e9eeb40b91c7e95e072118388d2b6610dc.zip chromium_src-eeb348e9eeb40b91c7e95e072118388d2b6610dc.tar.gz chromium_src-eeb348e9eeb40b91c7e95e072118388d2b6610dc.tar.bz2 | |
Revert 199566 "Drop more dependencies of ProfileKeyedService inf..."
> Drop more dependencies of ProfileKeyedService infrastructure on chrome.
>
> This extracts AssertFactoriesBuilt code to a file that will stay in chrome.
>
> BUG=227219
> R=erg@chromium.org
>
> Review URL: https://codereview.chromium.org/14967003
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/14701016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_profile.cc')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index a8b6e85..2d4a400 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -44,7 +44,6 @@ #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prerender/prerender_manager.h" -#include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/profiles/storage_partition_descriptor.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h" @@ -278,11 +277,6 @@ void TestingProfile::CreateTempProfileDir() { } void TestingProfile::Init() { - // Normally this would happen during browser startup, but for tests - // we need to trigger creation of Profile-related services. - ChromeBrowserMainExtraPartsProfiles:: - EnsureProfileKeyedServiceFactoriesBuilt(); - if (prefs_.get()) components::UserPrefs::Set(this, prefs_.get()); else |