Move extensions BCKS factory creation

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

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 3f743898cdf2b579ad722746c62698b558f78140..34b211bdb4734f7bb5e68b1ed09883210102f87e 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -4,9 +4,6 @@
 
 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
 
-#include "apps/app_load_service_factory.h"
-#include "apps/app_restore_service_factory.h"
-#include "apps/app_window_geometry_cache.h"
 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
 #include "chrome/browser/apps/shortcut_manager_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ -42,7 +39,6 @@
 #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/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"
@@ -54,66 +50,10 @@
 #include "chrome/browser/webdata/web_data_service_factory.h"
 
 #if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/activity_log/activity_log.h"

[James Cook, 2014/03/17 17:31:51]

In the old code, headers like this were not included/compiled if
ENABLE_EXTENSIONS wasn't set.  In the new code, I think they are.  Can
apps/browser_context_keyed_service_factories.{h|cc} be excluded if
enable_extensions==0?

[Ken Rockot(use gerrit already), 2014/03/17 20:08:27]

Done.

-#include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
-#include "chrome/browser/extensions/api/alarms/alarm_manager.h"
-#include "chrome/browser/extensions/api/audio/audio_api.h"
-#include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
-#include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
-#include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
-#include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h"
-#include "chrome/browser/extensions/api/commands/command_service.h"
-#include "chrome/browser/extensions/api/cookies/cookies_api.h"
-#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
-#include "chrome/browser/extensions/api/dial/dial_api_factory.h"
-#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
-#include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
-#include "chrome/browser/extensions/api/history/history_api.h"
-#include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
-#include "chrome/browser/extensions/api/identity/identity_api.h"
-#include "chrome/browser/extensions/api/idle/idle_manager_factory.h"
-#include "chrome/browser/extensions/api/input/input.h"
-#include "chrome/browser/extensions/api/location/location_manager.h"
-#include "chrome/browser/extensions/api/management/management_api.h"
-#include "chrome/browser/extensions/api/mdns/mdns_api.h"
-#include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"
-#include "chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h"
-#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
-#include "chrome/browser/extensions/api/preference/chrome_direct_setting_api.h"
-#include "chrome/browser/extensions/api/preference/preference_api.h"
-#include "chrome/browser/extensions/api/processes/processes_api.h"
-#include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
-#include "chrome/browser/extensions/api/runtime/runtime_api.h"
-#include "chrome/browser/extensions/api/serial/serial_connection.h"
-#include "chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h"
-#include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h"
-#include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
-#include "chrome/browser/extensions/api/system_info/system_info_api.h"
-#include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
-#include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
-#include "chrome/browser/extensions/api/usb/usb_device_resource.h"
-#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
-#include "chrome/browser/extensions/api/web_request/web_request_api.h"
-#include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h"
-#include "chrome/browser/extensions/extension_system_factory.h"
-#include "chrome/browser/extensions/extension_toolbar_model_factory.h"
-#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
-#include "chrome/browser/extensions/install_tracker_factory.h"
-#include "chrome/browser/extensions/menu_manager_factory.h"
-#include "chrome/browser/extensions/plugin_manager.h"
-#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
-#include "extensions/browser/api/api_resource_manager.h"
-#include "extensions/browser/api/socket/socket.h"
-#include "extensions/browser/api/socket/tcp_socket.h"
-#include "extensions/browser/api/socket/udp_socket.h"
-#include "extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.h"
-#include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h"
-#include "extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.h"
-#include "extensions/browser/api/storage/settings_frontend.h"
-#include "extensions/browser/extension_prefs_factory.h"
-#include "extensions/browser/renderer_startup_helper.h"
-#endif  // defined(ENABLE_EXTENSIONS)
+#include "apps/browser_context_keyed_service_factories.h"

[James Cook, 2014/03/17 17:31:51]

It's kind of weird that these three files all have different names. I would
either call them all browser_context_keyed_service_factories.h, or if MSVC/GYP
can't handle that, call them apps_browser_context_keyed_service_factories,
chrome_browser..., extensions_browser...

[Ken Rockot(use gerrit already), 2014/03/17 20:08:27]

Yeah, I didn't want to leave them like this. All changed to
browser_context_keyed_service_factories pending verification that MSVC doesn't
choke. I think if any of the affected targets builds more than one of these
modules, we're Doing It Wrong.

I decided against "keyed_service_factories" after all since it felt like I was
just setting someone  else up to rename it in the future. :)

+#include "chrome/browser/extensions/chrome_extensions_browser_context_keyed_service_factories.h"
+#include "extensions/browser/context_keyed_service_factories.h"
+#endif
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
@@ -146,15 +86,6 @@
 #endif
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
-#include "chrome/browser/chromeos/extensions/input_method_api.h"
-#include "chrome/browser/chromeos/extensions/media_player_api.h"
-#include "chrome/browser/chromeos/extensions/screenlock_private_api.h"
-#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
-#include "chrome/browser/extensions/api/log_private/log_private_api.h"
-#endif
-
 #if defined(USE_AURA)
 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
 #endif
@@ -169,7 +100,6 @@
 #endif
 
 #if defined(ENABLE_SPELLCHECK)
-#include "chrome/browser/extensions/api/spellcheck/spellcheck_api.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #endif
 
@@ -204,6 +134,13 @@ ChromeBrowserMainExtraPartsProfiles::~ChromeBrowserMainExtraPartsProfiles() {
 // static
 void ChromeBrowserMainExtraPartsProfiles::
 EnsureBrowserContextKeyedServiceFactoriesBuilt() {
+  AppShortcutManagerFactory::GetInstance();

[James Cook, 2014/03/17 17:31:51]

These used to be wrapped in ENABLE_EXTENSIONS. Do they need to always be in the
build?

Also, I would move these below the ENABLE_EXTENSIONS block below.

[Ken Rockot(use gerrit already), 2014/03/17 20:08:27]

Moved into the ENABLE_EXTENSIONS block.

+  EphemeralAppServiceFactory::GetInstance();
+#if defined(ENABLE_EXTENSIONS)
+  apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  EnsureChromeExtensionsBrowserContextKeyedServiceFactoriesBuilt();

[James Cook, 2014/03/17 17:31:51]

Ugh. Hmm. Yuck.

If it has to be an awful name like this, what about
EnsureBrowserContextKeyedServiceFactoriesBuiltForExtensions()? That was someone
grepping the code for "EnsureBrowserContextKeyed..." will find all the calls.

[Ken Rockot(use gerrit already), 2014/03/17 20:08:27]

How about consistent function names
(EnsureBrowserContextKeyedServiceFactoriesBuilt) each in their own namespace?
apps::, extensions::, and a new chrome_extensions::

The latter would be newly introduced, but any extensions code under //chrome
should ultimately wind up within it, kind of like chrome-only API code should
eventually wind up in chrome_api:: or perhaps even chrome_extensions::api...
Bah, I digress.

+#endif

[James Cook, 2014/03/17 17:31:51]

nit: Put a blank line after this ENABLE_EXTENSIONS block to emphasize that this
section is slightly different than what comes afterward.

[Ken Rockot(use gerrit already), 2014/03/17 20:08:27]

Done.

   AboutSigninInternalsFactory::GetInstance();
   autofill::PersonalDataManagerFactory::GetInstance();
 #if !defined(OS_ANDROID)
@@ -232,101 +169,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #endif
   dom_distiller::DomDistillerServiceFactory::GetInstance();
   DownloadServiceFactory::GetInstance();
-#if defined(ENABLE_EXTENSIONS)
-  AppShortcutManagerFactory::GetInstance();
-  apps::AppLoadServiceFactory::GetInstance();
-  apps::AppRestoreServiceFactory::GetInstance();
-  apps::AppWindowGeometryCache::Factory::GetInstance();
-  EphemeralAppServiceFactory::GetInstance();
-  extensions::ActivityLog::GetFactoryInstance();
-  extensions::ActivityLogAPI::GetFactoryInstance();
-  extensions::AlarmManager::GetFactoryInstance();
-  extensions::ApiResourceManager<extensions::ResumableTCPServerSocket>::
-      GetFactoryInstance();
-  extensions::ApiResourceManager<extensions::ResumableTCPSocket>::
-      GetFactoryInstance();
-  extensions::ApiResourceManager<extensions::ResumableUDPSocket>::
-      GetFactoryInstance();
-  extensions::ApiResourceManager<extensions::SerialConnection>::
-      GetFactoryInstance();
-  extensions::ApiResourceManager<extensions::Socket>::GetFactoryInstance();
-  extensions::ApiResourceManager<extensions::UsbDeviceResource>::
-      GetFactoryInstance();
-  extensions::core_api::TCPServerSocketEventDispatcher::GetFactoryInstance();
-  extensions::core_api::TCPSocketEventDispatcher::GetFactoryInstance();
-  extensions::core_api::UDPSocketEventDispatcher::GetFactoryInstance();
-  extensions::AudioAPI::GetFactoryInstance();
-  extensions::BookmarksAPI::GetFactoryInstance();
-  extensions::BookmarkManagerPrivateAPI::GetFactoryInstance();
-  extensions::BluetoothAPI::GetFactoryInstance();
-  extensions::BrailleDisplayPrivateAPI::GetFactoryInstance();
-  extensions::chromedirectsetting::ChromeDirectSettingAPI::GetFactoryInstance();
-  extensions::CommandService::GetFactoryInstance();
-  extensions::CookiesAPI::GetFactoryInstance();
-  extensions::DeveloperPrivateAPI::GetFactoryInstance();
-  extensions::DialAPIFactory::GetInstance();
-  extensions::ExtensionActionAPI::GetFactoryInstance();
-  extensions::ExtensionPrefsFactory::GetInstance();
-  extensions::ExtensionSystemFactory::GetInstance();
-  extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
-  extensions::FeedbackPrivateAPI::GetFactoryInstance();
-  extensions::FontSettingsAPI::GetFactoryInstance();
-  extensions::HistoryAPI::GetFactoryInstance();
-  extensions::HotwordPrivateEventService::GetFactoryInstance();
-  extensions::IdentityAPI::GetFactoryInstance();
-  extensions::IdleManagerFactory::GetInstance();
-  extensions::InstallTrackerFactory::GetInstance();
-#if defined(TOOLKIT_VIEWS)
-  extensions::InputAPI::GetFactoryInstance();
-#endif
-#if defined(OS_CHROMEOS)
-  extensions::InputImeAPI::GetFactoryInstance();
-  extensions::InputMethodAPI::GetFactoryInstance();
-  extensions::ScreenlockPrivateEventRouter::GetFactoryInstance();
-#endif
-  extensions::LocationManager::GetFactoryInstance();
-#if defined(OS_CHROMEOS)
-  extensions::LogPrivateAPI::GetFactoryInstance();
-#endif
-  extensions::ManagementAPI::GetFactoryInstance();
-  extensions::MDnsAPI::GetFactoryInstance();
-  extensions::MediaGalleriesPrivateAPI::GetFactoryInstance();
-#if defined(OS_CHROMEOS)
-  extensions::MediaPlayerAPI::GetFactoryInstance();
-#endif
-  extensions::MenuManagerFactory::GetInstance();
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX)
-  extensions::NetworkingPrivateEventRouterFactory::GetInstance();
-#endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
-  extensions::OmniboxAPI::GetFactoryInstance();
-#if defined(ENABLE_PLUGINS)
-  extensions::PluginManager::GetFactoryInstance();
-#endif  // defined(ENABLE_PLUGINS)
-  extensions::PreferenceAPI::GetFactoryInstance();
-  extensions::ProcessesAPI::GetFactoryInstance();
-  extensions::PushMessagingAPI::GetFactoryInstance();
-  extensions::RendererStartupHelperFactory::GetInstance();
-  extensions::RuntimeAPI::GetFactoryInstance();
-  extensions::SettingsFrontend::GetFactoryInstance();
-  extensions::SettingsOverridesAPI::GetFactoryInstance();
-  extensions::SignedInDevicesManager::GetFactoryInstance();
-#if defined(ENABLE_SPELLCHECK)
-  extensions::SpellcheckAPI::GetFactoryInstance();
-#endif
-  extensions::StreamsPrivateAPI::GetFactoryInstance();
-  extensions::SystemInfoAPI::GetFactoryInstance();
-  extensions::TabCaptureRegistry::GetFactoryInstance();
-  extensions::TabsWindowsAPI::GetFactoryInstance();
-  extensions::TtsAPI::GetFactoryInstance();
-  extensions::WebNavigationAPI::GetFactoryInstance();
-  extensions::WebRequestAPI::GetFactoryInstance();
-  extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
-  ExtensionToolbarModelFactory::GetInstance();
-#endif  // defined(ENABLE_EXTENSIONS)
   FaviconServiceFactory::GetInstance();
-#if defined(OS_CHROMEOS)
-  file_manager::FileBrowserPrivateAPIFactory::GetInstance();
-#endif
   FindBarStateFactory::GetInstance();
   GAIAInfoUpdateServiceFactory::GetInstance();
 #if defined(USE_AURA)
@@ -401,9 +244,6 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(ENABLE_THEMES)
   ThemeServiceFactory::GetInstance();
 #endif
-#if defined(ENABLE_EXTENSIONS)
-  TokenCacheServiceFactory::GetInstance();
-#endif
   WebDataServiceFactory::GetInstance();
 }