diff options
| author | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 17:00:58 +0000 |
|---|---|---|
| committer | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 17:00:58 +0000 |
| commit | 102253f8f90c2182190a825ec5573081f17dc9a2 (patch) | |
| tree | 67a5f14f723686dc16c74ffdf08d53520cc167a2 /chrome/test/base/testing_profile.cc | |
| parent | 565bb8d289a5b75331e189b4e813c8f2997b2ba3 (diff) | |
| download | chromium_src-102253f8f90c2182190a825ec5573081f17dc9a2.zip chromium_src-102253f8f90c2182190a825ec5573081f17dc9a2.tar.gz chromium_src-102253f8f90c2182190a825ec5573081f17dc9a2.tar.bz2 | |
Remove the protector service.
BUG=165008
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11493003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_profile.cc')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index ab118b7..1d2a6f6 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -41,7 +41,6 @@ #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/profiles/storage_partition_descriptor.h" -#include "chrome/browser/protector/protector_service_factory.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" #include "chrome/browser/webdata/web_data_service.h" @@ -555,14 +554,6 @@ policy::PolicyService* TestingProfile::GetPolicyService() { } void TestingProfile::SetPrefService(PrefService* prefs) { -#if defined(ENABLE_PROTECTOR_SERVICE) - // ProtectorService binds itself very closely to the PrefService at the moment - // of Profile creation and watches pref changes to update their backup. - // For tests that replace the PrefService after TestingProfile creation, - // ProtectorService is disabled to prevent further invalid memory accesses. - protector::ProtectorServiceFactory::GetInstance()-> - SetTestingFactory(this, NULL); -#endif prefs_.reset(prefs); } |