diff options
Diffstat (limited to 'chrome/browser')
54 files changed, 117 insertions, 69 deletions
diff --git a/chrome/browser/apps/ephemeral_app_service_factory.cc b/chrome/browser/apps/ephemeral_app_service_factory.cc index b4115ab..d7f3206 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.cc +++ b/chrome/browser/apps/ephemeral_app_service_factory.cc @@ -5,12 +5,12 @@ #include "chrome/browser/apps/ephemeral_app_service_factory.h" #include "chrome/browser/apps/ephemeral_app_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" -using extensions::ExtensionSystemFactory; +using extensions::ExtensionsBrowserClient; // static EphemeralAppService* @@ -28,7 +28,7 @@ EphemeralAppServiceFactory::EphemeralAppServiceFactory() : BrowserContextKeyedServiceFactory( "EphemeralAppService", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } EphemeralAppServiceFactory::~EphemeralAppServiceFactory() { @@ -41,8 +41,7 @@ BrowserContextKeyedService* EphemeralAppServiceFactory::BuildServiceInstanceFor( content::BrowserContext* EphemeralAppServiceFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return extensions::ExtensionsBrowserClient::Get()-> - GetOriginalContext(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool EphemeralAppServiceFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc index 8cc0231..f83dee4 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc @@ -5,13 +5,13 @@ #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/shortcuts_backend_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" - +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" // static AutocompleteClassifier* AutocompleteClassifierFactory::GetForProfile( @@ -35,7 +35,8 @@ AutocompleteClassifierFactory::AutocompleteClassifierFactory() : BrowserContextKeyedServiceFactory( "AutocompleteClassifier", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(TemplateURLServiceFactory::GetInstance()); // TODO(pkasting): Uncomment these once they exist. // DependsOn(PrefServiceFactory::GetInstance()); diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index dc5445d..c0a6c34 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -11,7 +11,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" @@ -21,6 +20,7 @@ #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc index 8fa202a..7e6dec0 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc @@ -12,11 +12,12 @@ #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" #include "chrome/browser/extensions/api/runtime/runtime_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" namespace chromeos { @@ -116,7 +117,8 @@ KioskAppUpdateServiceFactory::KioskAppUpdateServiceFactory() : BrowserContextKeyedServiceFactory( "KioskAppUpdateService", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } KioskAppUpdateServiceFactory::~KioskAppUpdateServiceFactory() { diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc index 8e2c562..78b0d28 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc @@ -13,6 +13,8 @@ #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace chromeos { @@ -34,7 +36,8 @@ class KioskDiagnosisRunner::Factory : public BrowserContextKeyedServiceFactory { : BrowserContextKeyedServiceFactory( "KioskDiagnosisRunner", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn(extensions::ExtensionsBrowserClient::Get() + ->GetExtensionSystemFactory()); DependsOn(extensions::FeedbackPrivateAPI::GetFactoryInstance()); } diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc index a7bfc89..5ab4149 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc @@ -7,10 +7,11 @@ #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h" #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace file_manager { @@ -32,7 +33,8 @@ FileBrowserPrivateAPIFactory::FileBrowserPrivateAPIFactory() "FileBrowserPrivateAPI", BrowserContextDependencyManager::GetInstance()) { DependsOn(drive::DriveIntegrationServiceFactory::GetInstance()); - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(VolumeManagerFactory::GetInstance()); } diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.cc b/chrome/browser/chromeos/extensions/install_limiter_factory.cc index 222c738..eeb5660 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.cc +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.cc @@ -5,9 +5,10 @@ #include "chrome/browser/chromeos/extensions/install_limiter_factory.h" #include "chrome/browser/chromeos/extensions/install_limiter.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -26,7 +27,7 @@ InstallLimiterFactory::InstallLimiterFactory() : BrowserContextKeyedServiceFactory( "InstallLimiter", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } InstallLimiterFactory::~InstallLimiterFactory() { diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc index be49e4e..59f85de 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc @@ -6,7 +6,6 @@ #include "base/memory/singleton.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index 6fc0236..ac0d074 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h" #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" @@ -34,6 +33,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "third_party/re2/re2/re2.h" @@ -338,7 +338,7 @@ ActivityLogFactory::ActivityLogFactory() : BrowserContextKeyedServiceFactory( "ActivityLog", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(InstallTrackerFactory::GetInstance()); } diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc index 1b7a2a9..1e59f80 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc @@ -15,6 +15,8 @@ #include "chrome/common/extensions/api/activity_log_private.h" #include "chrome/common/pref_names.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" @@ -36,7 +38,7 @@ ProfileKeyedAPIFactory<ActivityLogAPI>* ActivityLogAPI::GetFactoryInstance() { template<> void ProfileKeyedAPIFactory<ActivityLogAPI>::DeclareFactoryDependencies() { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(ActivityLogFactory::GetInstance()); } diff --git a/chrome/browser/extensions/api/declarative/declarative_api.cc b/chrome/browser/extensions/api/declarative/declarative_api.cc index 0606096..3e094ff 100644 --- a/chrome/browser/extensions/api/declarative/declarative_api.cc +++ b/chrome/browser/extensions/api/declarative/declarative_api.cc @@ -9,13 +9,13 @@ #include "base/task_runner_util.h" #include "base/values.h" #include "chrome/browser/extensions/api/declarative/rules_registry_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/guestview/webview/webview_guest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/events.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_api.h" using extensions::api::events::Rule; diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc index 9c8d8d2..6b69a2a 100644 --- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc +++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.cc b/chrome/browser/extensions/api/dial/dial_api_factory.cc index 8b11002..4b5b99e 100644 --- a/chrome/browser/extensions/api/dial/dial_api_factory.cc +++ b/chrome/browser/extensions/api/dial/dial_api_factory.cc @@ -5,8 +5,9 @@ #include "chrome/browser/extensions/api/dial/dial_api_factory.h" #include "chrome/browser/extensions/api/dial/dial_api.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -23,7 +24,7 @@ DialAPIFactory* DialAPIFactory::GetInstance() { DialAPIFactory::DialAPIFactory() : RefcountedBrowserContextKeyedServiceFactory( "DialAPI", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } DialAPIFactory::~DialAPIFactory() { diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc index 3b41fdd..6aa9bdf 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc @@ -11,6 +11,7 @@ #include "chrome/browser/search/hotword_service_factory.h" #include "chrome/common/pref_names.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 0a2e366..2171023 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -760,7 +760,7 @@ void IdentityAPI::OnAccountSignInChanged(const AccountIds& ids, template <> void ProfileKeyedAPIFactory<IdentityAPI>::DeclareFactoryDependencies() { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance()); } diff --git a/chrome/browser/extensions/api/idle/idle_manager_factory.cc b/chrome/browser/extensions/api/idle/idle_manager_factory.cc index 8cfd28c..ea605d5 100644 --- a/chrome/browser/extensions/api/idle/idle_manager_factory.cc +++ b/chrome/browser/extensions/api/idle/idle_manager_factory.cc @@ -5,9 +5,9 @@ #include "chrome/browser/extensions/api/idle/idle_manager_factory.h" #include "chrome/browser/extensions/api/idle/idle_manager.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -28,7 +28,7 @@ IdleManagerFactory::IdleManagerFactory() : BrowserContextKeyedServiceFactory( "IdleManager", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } IdleManagerFactory::~IdleManagerFactory() { diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc index 839e155..dd840d4 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc index 0d6ba84..ca4c59b 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/image_writer_private/test_utils.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/test/base/testing_profile.h" #include "extensions/browser/event_router.h" diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc index f09902e..78a189e 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc +++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc @@ -25,6 +25,7 @@ #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_function.h" +#include "extensions/browser/extension_system.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 73ea1c9..3977524 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -44,6 +44,7 @@ #include "content/public/browser/web_contents_view.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc index c9b7304..dbdd05a 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc @@ -5,10 +5,11 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -29,7 +30,7 @@ NetworkingPrivateServiceClientFactory::NetworkingPrivateServiceClientFactory() : BrowserContextKeyedServiceFactory( "NetworkingPrivateServiceClient", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } NetworkingPrivateServiceClientFactory diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index eb378f0..961637a 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -24,6 +24,8 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "ui/gfx/image/image.h" @@ -278,7 +280,7 @@ void OmniboxAPI::OnTemplateURLsLoaded() { template <> void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(TemplateURLServiceFactory::GetInstance()); } diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc index 09ff40d..49850f1 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" namespace extensions { namespace chromedirectsetting { @@ -151,4 +152,3 @@ void ChromeDirectSettingAPI::OnPrefChanged( } // namespace chromedirectsetting } // namespace extensions - diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index cc4a576..3b3be69 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -27,6 +27,8 @@ #include "extensions/browser/extension_pref_value_map_factory.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/pref_names.h" #include "extensions/common/error_utils.h" #include "extensions/common/permissions/api_permission.h" @@ -528,9 +530,9 @@ ExtensionPrefValueMap* PreferenceAPI::extension_pref_value_map() { template <> void ProfileKeyedAPIFactory<PreferenceAPI>::DeclareFactoryDependencies() { - DependsOn(ExtensionSystemFactory::GetInstance()); DependsOn(ExtensionPrefsFactory::GetInstance()); DependsOn(ExtensionPrefValueMapFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } PreferenceFunction::~PreferenceFunction() { } diff --git a/chrome/browser/extensions/api/profile_keyed_api_factory.h b/chrome/browser/extensions/api/profile_keyed_api_factory.h index 25eda67..7a5f3ab 100644 --- a/chrome/browser/extensions/api/profile_keyed_api_factory.h +++ b/chrome/browser/extensions/api/profile_keyed_api_factory.h @@ -5,12 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_ -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -72,11 +73,11 @@ class ProfileKeyedAPIFactory : public BrowserContextKeyedServiceFactory { // Then in the cc file (or inline in the header), define it, e.g.: // template <> // ProfileKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() { - // DependsOn(ExtensionSystemFactory::GetInstance()); + // DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); // DependsOn(ProfileSyncServiceFactory::GetInstance()); // } void DeclareFactoryDependencies() { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } ProfileKeyedAPIFactory() diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index a8604ff..56528fa 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -14,7 +14,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/token_cache/token_cache_service.h" #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" #include "chrome/browser/invalidation/invalidation_service.h" @@ -31,6 +30,8 @@ #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" #include "google_apis/gaia/gaia_constants.h" @@ -363,7 +364,7 @@ void PushMessagingAPI::SetMapperForTest( template <> void ProfileKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(invalidation::InvalidationServiceFactory::GetInstance()); } diff --git a/chrome/browser/extensions/api/runtime/runtime_api_factory.cc b/chrome/browser/extensions/api/runtime/runtime_api_factory.cc index 395bf8d..278fd9a 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api_factory.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api_factory.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/runtime/runtime_api_factory.h" #include "chrome/browser/extensions/api/runtime/runtime_api.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -27,7 +27,7 @@ RuntimeAPIFactory::RuntimeAPIFactory() : BrowserContextKeyedServiceFactory( "RuntimeAPI", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } RuntimeAPIFactory::~RuntimeAPIFactory() { diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc index 76e74ef..0fe2575 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc @@ -6,9 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -28,7 +29,7 @@ SystemIndicatorManagerFactory::SystemIndicatorManagerFactory() : BrowserContextKeyedServiceFactory( "SystemIndicatorManager", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } SystemIndicatorManagerFactory::~SystemIndicatorManagerFactory() {} diff --git a/chrome/browser/extensions/api/system_info/system_info_api.cc b/chrome/browser/extensions/api/system_info/system_info_api.cc index 7c1ab95..c6fc365 100644 --- a/chrome/browser/extensions/api/system_info/system_info_api.cc +++ b/chrome/browser/extensions/api/system_info/system_info_api.cc @@ -21,6 +21,7 @@ #include "chrome/common/extensions/api/system_display.h" #include "chrome/common/extensions/api/system_storage.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "ui/gfx/display_observer.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc index 4156f98..1117450 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc @@ -20,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/runtime_data.h" #include "net/base/net_log.h" #include "net/cookies/cookie_util.h" diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc index e945b5a..4854390 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc @@ -13,6 +13,7 @@ #include "content/public/browser/media_device_id.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_output_controller.h" diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.cc b/chrome/browser/extensions/dev_mode_bubble_controller.cc index 6845105..2bf7136 100644 --- a/chrome/browser/extensions/dev_mode_bubble_controller.cc +++ b/chrome/browser/extensions/dev_mode_bubble_controller.cc @@ -19,6 +19,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -123,7 +124,7 @@ void DevModeBubbleController::ClearProfileListForTesting() { // static bool DevModeBubbleController::IsDevModeExtension( const Extension* extension) { - if (!extensions::FeatureSwitch::force_dev_mode_highlighting()->IsEnabled()) { + if (!FeatureSwitch::force_dev_mode_highlighting()->IsEnabled()) { if (chrome::VersionInfo::GetChannel() < chrome::VersionInfo::CHANNEL_BETA) return false; @@ -135,10 +136,9 @@ bool DevModeBubbleController::IsDevModeExtension( DevModeBubbleController::DevModeBubbleController(Profile* profile) : ExtensionMessageBubbleController( new DevModeBubbleDelegate( - extensions::ExtensionSystem::Get(profile)->extension_service()), + ExtensionSystem::Get(profile)->extension_service()), profile), - profile_(profile) { -} + profile_(profile) {} DevModeBubbleController::~DevModeBubbleController() { } diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc index f088db9..7eb4531 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller.cc @@ -14,6 +14,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 9b0f86f..a64876b 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -26,6 +26,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/extensions/install_tracker_factory.cc b/chrome/browser/extensions/install_tracker_factory.cc index 9754f6c..593cf44 100644 --- a/chrome/browser/extensions/install_tracker_factory.cc +++ b/chrome/browser/extensions/install_tracker_factory.cc @@ -6,11 +6,11 @@ #include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -29,7 +29,7 @@ InstallTrackerFactory::InstallTrackerFactory() : BrowserContextKeyedServiceFactory( "InstallTracker", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } InstallTrackerFactory::~InstallTrackerFactory() { diff --git a/chrome/browser/extensions/menu_manager_factory.cc b/chrome/browser/extensions/menu_manager_factory.cc index cb8ec59..a34d7b5 100644 --- a/chrome/browser/extensions/menu_manager_factory.cc +++ b/chrome/browser/extensions/menu_manager_factory.cc @@ -4,11 +4,11 @@ #include "chrome/browser/extensions/menu_manager_factory.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/menu_manager.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -29,7 +29,7 @@ MenuManagerFactory::MenuManagerFactory() : BrowserContextKeyedServiceFactory( "MenuManager", BrowserContextDependencyManager::GetInstance()) { - DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } MenuManagerFactory::~MenuManagerFactory() {} diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc index 26f142f..c0906f9 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc @@ -15,6 +15,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.cc b/chrome/browser/extensions/token_cache/token_cache_service_factory.cc index 1c09aec..47381d7 100644 --- a/chrome/browser/extensions/token_cache/token_cache_service_factory.cc +++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/token_cache/token_cache_service.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" diff --git a/chrome/browser/managed_mode/managed_user_service_factory.cc b/chrome/browser/managed_mode/managed_user_service_factory.cc index 08dfb75..a4a992f 100644 --- a/chrome/browser/managed_mode/managed_user_service_factory.cc +++ b/chrome/browser/managed_mode/managed_user_service_factory.cc @@ -4,12 +4,13 @@ #include "chrome/browser/managed_mode/managed_user_service_factory.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/managed_mode/managed_user_service.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" // static ManagedUserService* ManagedUserServiceFactory::GetForProfile(Profile* profile) { @@ -32,7 +33,8 @@ ManagedUserServiceFactory::ManagedUserServiceFactory() : BrowserContextKeyedServiceFactory( "ManagedUserService", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance()); } diff --git a/chrome/browser/prerender/prerender_manager_factory.cc b/chrome/browser/prerender/prerender_manager_factory.cc index f7dc4d0..c1cd771 100644 --- a/chrome/browser/prerender/prerender_manager_factory.cc +++ b/chrome/browser/prerender/prerender_manager_factory.cc @@ -10,7 +10,6 @@ #include "base/debug/trace_event.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/predictors/predictor_database_factory.h" #include "chrome/browser/prerender/prerender_manager.h" @@ -18,6 +17,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/prerender_condition_network.h" @@ -49,7 +50,8 @@ PrerenderManagerFactory::PrerenderManagerFactory() : BrowserContextKeyedServiceFactory( "PrerenderManager", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); // PrerenderLocalPredictor observers the history visit DB. DependsOn(HistoryServiceFactory::GetInstance()); DependsOn(predictors::PredictorDatabaseFactory::GetInstance()); diff --git a/chrome/browser/speech/extension_api/tts_extension_api.cc b/chrome/browser/speech/extension_api/tts_extension_api.cc index eada6b3..e9fd625 100644 --- a/chrome/browser/speech/extension_api/tts_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_extension_api.cc @@ -15,6 +15,7 @@ #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h" #include "chrome/browser/speech/tts_controller.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "ui/base/l10n/l10n_util.h" namespace constants = tts_extension_api_constants; diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index dcb9d88..0a6bc5d 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/pref_service_flags_storage.h" diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index ead6939..6e2f869 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -10,7 +10,6 @@ #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/invalidation/invalidation_service_factory.h" #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" @@ -32,6 +31,8 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/pref_names.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" // static ProfileSyncServiceFactory* ProfileSyncServiceFactory::GetInstance() { @@ -59,7 +60,8 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory() DependsOn(AboutSigninInternalsFactory::GetInstance()); DependsOn(autofill::PersonalDataManagerFactory::GetInstance()); DependsOn(BookmarkModelFactory::GetInstance()); - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(GlobalErrorServiceFactory::GetInstance()); DependsOn(HistoryServiceFactory::GetInstance()); DependsOn(invalidation::InvalidationServiceFactory::GetInstance()); diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc index 6f687d7..3143ab33 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc @@ -14,8 +14,6 @@ #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -33,6 +31,9 @@ #include "chrome/browser/sync_file_system/sync_task.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "google_apis/drive/drive_api_url_generator.h" #include "google_apis/drive/gdata_wapi_url_generator.h" @@ -110,7 +111,8 @@ void SyncEngine::AppendDependsOnFactories( DCHECK(factories); factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); factories->insert(ProfileOAuth2TokenServiceFactory::GetInstance()); - factories->insert(extensions::ExtensionSystemFactory::GetInstance()); + factories->insert( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } SyncEngine::~SyncEngine() { diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc index 1a1d129..ea36c73 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc @@ -34,6 +34,8 @@ #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "webkit/browser/fileapi/file_system_url.h" @@ -103,7 +105,8 @@ void DriveFileSyncService::AppendDependsOnFactories( DCHECK(factories); factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); factories->insert(ProfileOAuth2TokenServiceFactory::GetInstance()); - factories->insert(extensions::ExtensionSystemFactory::GetInstance()); + factories->insert( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } scoped_ptr<DriveFileSyncService> DriveFileSyncService::CreateForTesting( diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h index 1400f96..ed6fcc6 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h @@ -18,7 +18,6 @@ #include "base/threading/non_thread_safe.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "chrome/browser/drive/drive_notification_observer.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/sync_file_system/conflict_resolution_resolver.h" diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc index 36be6bf7..4a1cc37 100644 --- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc +++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc @@ -5,12 +5,13 @@ #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_syncable_service.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" namespace app_list { @@ -30,7 +31,8 @@ AppListSyncableServiceFactory::AppListSyncableServiceFactory() : BrowserContextKeyedServiceFactory( "AppListSyncableService", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); } AppListSyncableServiceFactory::~AppListSyncableServiceFactory() { diff --git a/chrome/browser/ui/app_list/recommended_apps.cc b/chrome/browser/ui/app_list/recommended_apps.cc index 1d5c796..76833fd 100644 --- a/chrome/browser/ui/app_list/recommended_apps.cc +++ b/chrome/browser/ui/app_list/recommended_apps.cc @@ -9,13 +9,15 @@ #include "base/bind.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/recommended_apps_observer.h" #include "chrome/common/pref_names.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/ui/app_list/search/app_result.cc b/chrome/browser/ui/app_list/search/app_result.cc index ce1853a..56e3d88 100644 --- a/chrome/browser/ui/app_list/search/app_result.cc +++ b/chrome/browser/ui/app_list/search/app_result.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/app_list/search/app_result.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" @@ -19,6 +18,9 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_system.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc index 6c897bf..7322349 100644 --- a/chrome/browser/ui/app_list/start_page_service.cc +++ b/chrome/browser/ui/app_list/start_page_service.cc @@ -23,6 +23,8 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "ui/app_list/app_list_switches.h" diff --git a/chrome/browser/ui/app_list/start_page_service_factory.cc b/chrome/browser/ui/app_list/start_page_service_factory.cc index 0e65866..636814a 100644 --- a/chrome/browser/ui/app_list/start_page_service_factory.cc +++ b/chrome/browser/ui/app_list/start_page_service_factory.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/app_list/start_page_service_factory.h" #include "base/command_line.h" -#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/start_page_service.h" @@ -13,6 +12,8 @@ #include "chrome/common/pref_names.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/user_prefs/pref_registry_syncable.h" +#include "extensions/browser/extension_system_provider.h" +#include "extensions/browser/extensions_browser_client.h" #include "ui/app_list/app_list_switches.h" namespace app_list { @@ -38,7 +39,8 @@ StartPageServiceFactory::StartPageServiceFactory() : BrowserContextKeyedServiceFactory( "AppListStartPageService", BrowserContextDependencyManager::GetInstance()) { - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn( + extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); DependsOn(extensions::InstallTrackerFactory::GetInstance()); } diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 5adbf62..1ffbe6d 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -58,6 +58,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 56471a8..2362075 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -64,6 +64,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc index 2a32f34..a5def4b 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.cc +++ b/chrome/browser/ui/webui/identity_internals_ui.cc @@ -19,6 +19,7 @@ #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" +#include "extensions/browser/extension_system.h" #include "google_apis/gaia/gaia_auth_fetcher.h" #include "google_apis/gaia/gaia_constants.h" #include "grit/browser_resources.h" |