Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5081)

Unified Diff: chrome/test/base/testing_profile.cc

Issue 9863047: Exclude ProtectorService code from Android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698