| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 722d4e608011f904b613153a84221294983dc376..962e3abd99fe013ea28292b24a9bee4287e506a3 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -542,12 +542,14 @@ WebDataService* TestingProfile::GetWebDataServiceWithoutCreating() {
|
| }
|
|
|
| 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);
|
| }
|
|
|
|
|