Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc |
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc |
index 674116fe94ce74810b019e4653e2b8d848e8a262..f416f17855ba619207690610b8a73b89dd2d98f5 100644 |
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc |
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc |
@@ -15,6 +15,44 @@ |
#include "chrome/browser/content_settings/cookie_settings.h" |
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" |
#include "chrome/browser/download/download_service_factory.h" |
+#include "chrome/browser/favicon/favicon_service_factory.h" |
+#include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h" |
+#include "chrome/browser/google/google_url_tracker_factory.h" |
+#include "chrome/browser/history/history_service_factory.h" |
+#include "chrome/browser/history/shortcuts_backend_factory.h" |
+#include "chrome/browser/invalidation/invalidation_service_factory.h" |
+#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" |
+#include "chrome/browser/notifications/desktop_notification_service_factory.h" |
+#include "chrome/browser/password_manager/password_store_factory.h" |
+#include "chrome/browser/plugins/plugin_prefs_factory.h" |
+#include "chrome/browser/policy/profile_policy_connector_factory.h" |
+#include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" |
+#include "chrome/browser/predictors/predictor_database_factory.h" |
+#include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" |
+#include "chrome/browser/prerender/prerender_link_manager_factory.h" |
+#include "chrome/browser/prerender/prerender_manager_factory.h" |
+#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" |
+#include "chrome/browser/profiles/gaia_info_update_service_factory.h" |
+#include "chrome/browser/search/instant_service_factory.h" |
+#include "chrome/browser/search_engines/template_url_fetcher_factory.h" |
+#include "chrome/browser/search_engines/template_url_service_factory.h" |
+#include "chrome/browser/sessions/session_service_factory.h" |
+#include "chrome/browser/sessions/tab_restore_service_factory.h" |
+#include "chrome/browser/signin/about_signin_internals_factory.h" |
+#include "chrome/browser/signin/signin_manager_factory.h" |
+#include "chrome/browser/signin/token_service_factory.h" |
+#include "chrome/browser/speech/extension_api/tts_extension_api.h" |
+#include "chrome/browser/sync/profile_sync_service_factory.h" |
+#include "chrome/browser/themes/theme_service_factory.h" |
+#include "chrome/browser/thumbnails/thumbnail_service_factory.h" |
+#include "chrome/browser/ui/find_bar/find_bar_state_factory.h" |
+#include "chrome/browser/ui/global_error/global_error_service_factory.h" |
+#include "chrome/browser/ui/tabs/pinned_tab_service_factory.h" |
+#include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" |
+#include "chrome/browser/user_style_sheet_watcher_factory.h" |
+#include "chrome/browser/webdata/web_data_service_factory.h" |
+ |
+#if defined(ENABLE_EXTENSIONS) |
#include "chrome/browser/extensions/activity_log/activity_log.h" |
#include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" |
#include "chrome/browser/extensions/api/alarms/alarm_manager.h" |
@@ -62,42 +100,7 @@ |
#include "chrome/browser/extensions/install_tracker_factory.h" |
#include "chrome/browser/extensions/plugin_manager.h" |
#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" |
-#include "chrome/browser/favicon/favicon_service_factory.h" |
-#include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h" |
-#include "chrome/browser/google/google_url_tracker_factory.h" |
-#include "chrome/browser/history/history_service_factory.h" |
-#include "chrome/browser/history/shortcuts_backend_factory.h" |
-#include "chrome/browser/invalidation/invalidation_service_factory.h" |
-#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" |
-#include "chrome/browser/notifications/desktop_notification_service_factory.h" |
-#include "chrome/browser/password_manager/password_store_factory.h" |
-#include "chrome/browser/plugins/plugin_prefs_factory.h" |
-#include "chrome/browser/policy/profile_policy_connector_factory.h" |
-#include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" |
-#include "chrome/browser/predictors/predictor_database_factory.h" |
-#include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" |
-#include "chrome/browser/prerender/prerender_link_manager_factory.h" |
-#include "chrome/browser/prerender/prerender_manager_factory.h" |
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" |
-#include "chrome/browser/profiles/gaia_info_update_service_factory.h" |
-#include "chrome/browser/search/instant_service_factory.h" |
-#include "chrome/browser/search_engines/template_url_fetcher_factory.h" |
-#include "chrome/browser/search_engines/template_url_service_factory.h" |
-#include "chrome/browser/sessions/session_service_factory.h" |
-#include "chrome/browser/sessions/tab_restore_service_factory.h" |
-#include "chrome/browser/signin/about_signin_internals_factory.h" |
-#include "chrome/browser/signin/signin_manager_factory.h" |
-#include "chrome/browser/signin/token_service_factory.h" |
-#include "chrome/browser/speech/extension_api/tts_extension_api.h" |
-#include "chrome/browser/sync/profile_sync_service_factory.h" |
-#include "chrome/browser/themes/theme_service_factory.h" |
-#include "chrome/browser/thumbnails/thumbnail_service_factory.h" |
-#include "chrome/browser/ui/find_bar/find_bar_state_factory.h" |
-#include "chrome/browser/ui/global_error/global_error_service_factory.h" |
-#include "chrome/browser/ui/tabs/pinned_tab_service_factory.h" |
-#include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" |
-#include "chrome/browser/user_style_sheet_watcher_factory.h" |
-#include "chrome/browser/webdata/web_data_service_factory.h" |
+#endif // defined(ENABLE_EXTENSIONS) |
#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
#include "chrome/browser/captive_portal/captive_portal_service_factory.h" |
@@ -341,7 +344,9 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() { |
#if defined(ENABLE_THEMES) |
ThemeServiceFactory::GetInstance(); |
#endif |
+#if defined(ENABLE_EXTENSIONS) |
TokenCacheServiceFactory::GetInstance(); |
+#endif |
TokenServiceFactory::GetInstance(); |
#if !defined(OS_ANDROID) |
UserStyleSheetWatcherFactory::GetInstance(); |