Protect references to ThemeService* with ENABLE_THEMES
On android, ENABLE_THEMES and ENABLE_PROTECTOR_SERVICE are not defined.
This fixes some link errors for unit_tests.
BUG=117407
TEST=
Review URL: https://chromiumcodereview.appspot.com/10704148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146028 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 8cc4bb1..1f2a887 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1873,12 +1873,14 @@
extension_paths)))
NOTREACHED();
+#if defined(ENABLE_THEMES)
// Also garbage-collect themes. We check |profile_| to be
// defensive; in the future, we may call GarbageCollectExtensions()
// from somewhere other than Init() (e.g., in a timer).
if (profile_) {
ThemeServiceFactory::GetForProfile(profile_)->RemoveUnusedThemes();
}
+#endif
}
void ExtensionService::SyncExtensionChangeIfNeeded(const Extension& extension) {
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 219e01119..a0cc83a 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -414,7 +414,9 @@
chrome::RegisterUserPrefs(prefs);
profile->SetPrefService(prefs);
+#if defined(ENABLE_THEMES)
ThemeServiceFactory::GetInstance()->ForceRegisterPrefsForTest(prefs);
+#endif
PluginPrefsFactory::GetInstance()->ForceRegisterPrefsForTest(prefs);
profile_.reset(profile);
diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index c170078..8d162ed 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -33,9 +33,13 @@
"ExtensionSystemShared",
ProfileDependencyManager::GetInstance()) {
DependsOn(GlobalErrorServiceFactory::GetInstance());
+#if defined(ENABLE_THEMES)
DependsOn(ThemeServiceFactory::GetInstance());
+#endif
+#if defined(ENABLE_PROTECTOR_SERVICE)
// ProtectorService should be destroyed after us.
DependsOn(protector::ProtectorServiceFactory::GetInstance());
+#endif
}
ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() {
