From 59b0e604edbb08da5e5f5aff8fa1832c381452ad Mon Sep 17 00:00:00 2001 From: "yoz@chromium.org" Date: Thu, 30 Jan 2014 00:41:24 +0000 Subject: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. This moves ExtensionSystem to extensions/browser. It also moves setting the channel for Features to ChromeExtensionsBrowserClient. It also removes the duplicate ExtensionSystem::GetForBrowserContext. BUG=337707 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/147923005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247788 0039d316-1c4b-4281-b951-d872f2087c98 --- apps/app_load_service.cc | 4 +- apps/launcher.cc | 2 +- apps/saved_files_service.cc | 1 + apps/saved_files_service_unittest.cc | 1 + apps/shell/shell_browser_main_parts.cc | 4 +- apps/shell/shell_extension_system.h | 2 +- apps/shell_window.cc | 2 +- .../accessibility/accessibility_extension_api.cc | 2 +- chrome/browser/app_controller_mac.mm | 2 +- chrome/browser/apps/app_browsertest.cc | 2 +- .../apps/app_launch_for_metro_restart_win.cc | 2 +- chrome/browser/apps/ephemeral_app_browsertest.cc | 2 +- chrome/browser/apps/ephemeral_app_launcher.cc | 2 +- chrome/browser/apps/ephemeral_app_service.cc | 2 +- .../apps/ephemeral_app_service_browsertest.cc | 2 +- chrome/browser/apps/ephemeral_app_throttle.cc | 2 +- chrome/browser/apps/shortcut_manager.cc | 2 +- .../browser/autocomplete/extension_app_provider.cc | 6 +- chrome/browser/autocomplete/keyword_provider.cc | 2 +- .../browser/automation/automation_provider_json.cc | 2 +- .../automation/automation_provider_observers.cc | 2 +- chrome/browser/automation/automation_util.cc | 2 +- .../automation/testing_automation_provider.cc | 2 +- .../background_application_list_model.cc | 2 +- .../background_application_list_model_unittest.cc | 2 +- .../background/background_contents_service.cc | 2 +- .../browser/background/background_mode_manager.cc | 2 +- chrome/browser/chrome_browser_main.cc | 2 +- chrome/browser/chrome_content_browser_client.cc | 8 +- .../accessibility/accessibility_manager.cc | 2 +- .../chromeos/accessibility/accessibility_manager.h | 2 +- chrome/browser/chromeos/app_mode/kiosk_app_data.cc | 2 +- .../chromeos/app_mode/kiosk_app_update_service.cc | 2 +- .../chromeos/app_mode/startup_app_launcher.cc | 2 +- .../extensions/file_manager/event_router.cc | 2 +- .../chromeos/extensions/input_method_api.cc | 10 +- .../extensions/input_method_event_router.cc | 5 +- .../extensions/media_player_event_router.cc | 2 +- .../chromeos/extensions/screenlock_private_api.cc | 2 +- .../chromeos/extensions/wallpaper_manager_util.cc | 2 +- .../chromeos/file_manager/file_browser_handlers.cc | 2 +- chrome/browser/chromeos/file_manager/file_tasks.cc | 2 +- .../chromeos/file_manager/file_tasks_unittest.cc | 2 +- .../browser/chromeos/file_manager/fileapi_util.cc | 2 +- chrome/browser/chromeos/file_manager/open_util.cc | 2 +- .../first_run/drive_first_run_browsertest.cc | 2 +- .../first_run/drive_first_run_controller.cc | 2 +- chrome/browser/chromeos/first_run/first_run.cc | 2 +- .../component_extension_ime_manager_impl.cc | 2 +- .../chromeos/kiosk_mode/kiosk_mode_screensaver.cc | 2 +- chrome/browser/chromeos/login/help_app_launcher.cc | 2 +- chrome/browser/chromeos/login/kiosk_browsertest.cc | 2 +- chrome/browser/chromeos/login/login_browsertest.cc | 2 +- .../chromeos/login/merge_session_load_page.cc | 2 +- .../browser/chromeos/offline/offline_load_page.cc | 2 +- .../policy/device_local_account_browsertest.cc | 2 +- .../devtools/devtools_sanity_browsertest.cc | 2 +- chrome/browser/devtools/devtools_target_impl.cc | 2 +- chrome/browser/devtools/devtools_window.cc | 3 +- chrome/browser/download/download_browsertest.cc | 2 +- chrome/browser/download/download_crx_util.cc | 2 +- .../extensions/active_tab_permission_granter.cc | 2 +- .../extensions/activity_log/activity_log.cc | 2 +- chrome/browser/extensions/alert_apitest.cc | 2 +- chrome/browser/extensions/all_urls_apitest.cc | 2 +- .../activity_log_private_api.cc | 2 +- .../browser/extensions/api/alarms/alarm_manager.cc | 2 +- chrome/browser/extensions/api/api_function.cc | 2 +- .../extensions/api/app_runtime/app_runtime_api.cc | 2 +- chrome/browser/extensions/api/audio/audio_api.cc | 2 +- .../api/autotest_private/autotest_private_api.cc | 2 +- .../extensions/api/bluetooth/bluetooth_api.cc | 2 +- .../api/bluetooth/bluetooth_event_router.cc | 3 +- .../bookmark_manager_private_api.cc | 2 +- .../extensions/api/bookmarks/bookmarks_api.cc | 2 +- .../braille_display_private_api.cc | 2 +- .../api/cast_channel/cast_channel_api.cc | 2 +- .../extensions/api/commands/command_service.cc | 2 +- .../api/content_settings/content_settings_api.cc | 2 +- .../browser/extensions/api/cookies/cookies_api.cc | 2 +- .../extensions/api/debugger/debugger_api.cc | 2 +- .../api/declarative/rules_cache_delegate.cc | 2 +- .../extensions/api/declarative/rules_registry.cc | 2 +- .../api/declarative_content/content_action.cc | 3 +- .../declarative_content/content_rules_registry.cc | 2 +- .../webrequest_rules_registry.cc | 3 +- .../api/developer_private/developer_private_api.cc | 2 +- chrome/browser/extensions/api/dial/dial_api.cc | 2 +- .../extensions/api/downloads/downloads_api.cc | 4 +- .../api/extension_action/browser_action_apitest.cc | 6 +- .../browser_action_interactive_test.cc | 2 +- .../api/extension_action/extension_action_api.cc | 2 +- .../api/extension_action/page_action_apitest.cc | 2 +- .../api/feedback_private/feedback_browsertest.cc | 2 +- .../api/feedback_private/feedback_private_api.cc | 2 +- .../extensions/api/file_system/file_system_api.cc | 2 +- .../api/font_settings/font_settings_api.cc | 2 +- chrome/browser/extensions/api/gcm/gcm_api.cc | 2 +- .../browser/extensions/api/history/history_api.cc | 2 +- .../extensions/api/identity/account_tracker.cc | 2 +- .../extensions/api/identity/identity_api.cc | 2 +- .../extensions/api/identity/web_auth_flow.cc | 3 +- chrome/browser/extensions/api/idle/idle_manager.cc | 2 +- .../api/image_writer_private/operation_manager.cc | 2 +- .../extensions/api/input_ime/input_ime_api.cc | 2 +- .../extensions/api/location/location_manager.cc | 2 +- .../extensions/api/management/management_api.cc | 2 +- .../api/management/management_api_browsertest.cc | 2 +- .../api/management/management_apitest.cc | 2 +- .../api/management/management_browsertest.cc | 2 +- chrome/browser/extensions/api/mdns/mdns_api.cc | 2 +- .../api/media_galleries/media_galleries_apitest.cc | 2 +- .../gallery_watch_state_tracker.cc | 2 +- .../media_galleries_private_api.cc | 2 +- .../media_galleries_private_apitest.cc | 2 +- .../media_galleries_private_event_router.cc | 2 +- .../media_galleries_watch_apitest.cc | 2 +- .../api/messaging/extension_message_port.cc | 2 +- .../extensions/api/messaging/message_service.cc | 2 +- chrome/browser/extensions/api/module/module.cc | 2 +- .../networking_private_api_nonchromeos.cc | 2 +- .../networking_private_event_router_chromeos.cc | 2 +- .../networking_private_event_router_nonchromeos.cc | 2 +- .../api/notifications/notifications_api.cc | 3 +- .../browser/extensions/api/omnibox/omnibox_api.cc | 2 +- .../extensions/api/preference/preference_api.cc | 2 +- .../api/preference/preference_helpers.cc | 2 +- .../extensions/api/processes/processes_api.cc | 2 +- .../api/push_messaging/push_messaging_api.cc | 2 +- .../browser/extensions/api/runtime/runtime_api.cc | 13 +- chrome/browser/extensions/api/serial/serial_api.cc | 2 +- .../api/serial/serial_event_dispatcher.cc | 2 +- .../signed_in_devices/signed_in_devices_manager.cc | 2 +- chrome/browser/extensions/api/socket/socket_api.cc | 2 +- .../api/sockets_tcp/tcp_socket_event_dispatcher.cc | 2 +- .../tcp_server_socket_event_dispatcher.cc | 2 +- .../api/sockets_udp/udp_socket_event_dispatcher.cc | 2 +- .../api/storage/managed_value_store_cache.cc | 2 +- .../extensions/api/storage/settings_apitest.cc | 5 +- .../extensions/api/storage/settings_frontend.cc | 2 +- .../api/storage/settings_sync_unittest.cc | 2 +- .../api/streams_private/streams_private_api.cc | 2 +- .../api/streams_private/streams_private_apitest.cc | 2 +- .../extension_sync_event_observer.cc | 2 +- .../system_indicator/system_indicator_apitest.cc | 2 +- .../system_indicator/system_indicator_manager.cc | 2 +- .../system_storage/system_storage_eject_apitest.cc | 2 +- .../api/tab_capture/tab_capture_registry.cc | 2 +- .../extensions/api/tabs/tabs_event_router.cc | 2 +- .../extensions/api/tabs/tabs_windows_api.cc | 2 +- .../extensions/api/tabs/windows_event_router.cc | 2 +- .../api/terminal/terminal_private_api.cc | 2 +- chrome/browser/extensions/api/usb/usb_api.cc | 2 +- .../api/web_navigation/web_navigation_api.cc | 2 +- .../web_navigation/web_navigation_api_helpers.cc | 2 +- .../api/web_navigation/web_navigation_apitest.cc | 2 +- .../extensions/api/web_request/web_request_api.cc | 6 +- .../api/web_request/web_request_apitest.cc | 2 +- .../api/webstore_private/webstore_private_api.cc | 2 +- chrome/browser/extensions/app_icon_loader_impl.cc | 2 +- chrome/browser/extensions/app_process_apitest.cc | 2 +- .../browser/extensions/browser_action_apitest.cc | 2 +- chrome/browser/extensions/browsertest_util.cc | 3 +- .../extensions/chrome_extensions_browser_client.cc | 9 +- .../extensions/chrome_notification_observer.cc | 2 +- chrome/browser/extensions/context_menu_matcher.cc | 2 +- chrome/browser/extensions/crx_installer.cc | 2 +- .../extensions/crx_installer_browsertest.cc | 2 +- chrome/browser/extensions/devtools_util.cc | 2 +- .../extensions/error_console/error_console.cc | 2 +- .../browser/extensions/event_router_forwarder.cc | 2 +- .../browser/extensions/extension_action_manager.cc | 2 +- chrome/browser/extensions/extension_apitest.cc | 2 +- .../extensions/extension_bindings_apitest.cc | 2 +- chrome/browser/extensions/extension_browsertest.cc | 2 +- chrome/browser/extensions/extension_browsertest.h | 3 +- .../extension_context_menu_browsertest.cc | 2 +- .../extensions/extension_context_menu_model.cc | 2 +- .../extension_context_menu_model_unittest.cc | 2 +- .../extension_crash_recovery_browsertest.cc | 2 +- .../extensions/extension_function_dispatcher.cc | 7 +- chrome/browser/extensions/extension_host.cc | 16 +- chrome/browser/extensions/extension_installer.cc | 2 +- .../extensions/extension_keybinding_registry.cc | 2 +- .../extensions/extension_messages_apitest.cc | 2 +- .../extensions/extension_nacl_browsertest.cc | 2 +- chrome/browser/extensions/extension_service.cc | 2 +- .../extensions/extension_service_unittest.cc | 2 +- .../extensions/extension_startup_browsertest.cc | 2 +- .../extensions/extension_sync_service_factory.cc | 5 +- chrome/browser/extensions/extension_system.cc | 460 --------------------- chrome/browser/extensions/extension_system.h | 263 ------------ .../browser/extensions/extension_system_factory.cc | 16 +- .../browser/extensions/extension_system_factory.h | 18 +- chrome/browser/extensions/extension_system_impl.cc | 436 +++++++++++++++++++ chrome/browser/extensions/extension_system_impl.h | 145 +++++++ .../extension_test_notification_observer.cc | 2 +- chrome/browser/extensions/extension_util.cc | 8 +- chrome/browser/extensions/extension_view_host.cc | 6 +- .../extensions/extension_view_host_factory.cc | 2 +- .../extensions/extension_warning_badge_service.cc | 5 +- .../extensions/extension_warning_service.cc | 2 +- .../extensions/extension_web_contents_observer.cc | 4 +- .../browser/extensions/external_provider_impl.cc | 2 +- chrome/browser/extensions/gpu_browsertest.cc | 2 +- .../extensions/gtalk_extension_browsertest.cc | 2 +- .../browser/extensions/install_tracker_factory.cc | 2 +- chrome/browser/extensions/installed_loader.cc | 2 +- .../extensions/lazy_background_page_apitest.cc | 2 +- chrome/browser/extensions/menu_manager.cc | 2 +- chrome/browser/extensions/menu_manager_factory.cc | 2 +- chrome/browser/extensions/menu_manager_unittest.cc | 2 +- chrome/browser/extensions/navigation_observer.cc | 2 +- chrome/browser/extensions/options_page_apitest.cc | 2 +- .../browser/extensions/page_action_browsertest.cc | 2 +- .../browser/extensions/page_action_controller.cc | 2 +- chrome/browser/extensions/permissions_updater.cc | 2 +- chrome/browser/extensions/plugin_apitest.cc | 2 +- .../extensions/process_management_browsertest.cc | 2 +- .../extensions/process_manager_browsertest.cc | 2 +- .../signin/gaia_auth_extension_loader.cc | 2 +- .../browser/extensions/suggest_permission_util.cc | 3 +- chrome/browser/extensions/tab_helper.cc | 2 +- chrome/browser/extensions/test_extension_system.cc | 2 +- chrome/browser/extensions/test_extension_system.h | 5 +- .../updater/extension_updater_unittest.cc | 2 +- chrome/browser/extensions/user_script_master.cc | 2 +- .../webstore_inline_installer_browsertest.cc | 3 +- chrome/browser/extensions/webstore_installer.cc | 2 +- .../extensions/webstore_standalone_installer.cc | 2 +- .../webstore_startup_installer_browsertest.cc | 2 +- chrome/browser/extensions/window_open_apitest.cc | 2 +- .../log_sources/chrome_internal_log_source.cc | 2 +- .../browser/managed_mode/managed_user_service.cc | 2 +- ...rotected_media_identifier_permission_context.cc | 2 +- .../media_galleries/media_file_system_registry.cc | 2 +- .../media_file_system_registry_unittest.cc | 2 +- .../media_galleries_permissions_unittest.cc | 2 +- .../media_galleries/media_galleries_preferences.cc | 2 +- .../media_galleries_preferences_unittest.cc | 2 +- ...eries_scan_result_dialog_controller_unittest.cc | 2 +- .../media_galleries/media_galleries_test_util.cc | 2 +- .../win/mtp_device_delegate_impl_win_unittest.cc | 2 +- .../nacl_host/nacl_browser_delegate_impl.cc | 5 +- chrome/browser/net/chrome_network_delegate.cc | 2 +- .../notifications/desktop_notification_service.cc | 2 +- .../message_center_notification_manager.cc | 2 +- .../message_center_settings_controller.cc | 2 +- chrome/browser/policy/policy_browsertest.cc | 2 +- .../browser/profile_resetter/profile_resetter.cc | 2 +- .../profiles/off_the_record_profile_impl.cc | 2 +- chrome/browser/profiles/profile_impl.cc | 2 +- chrome/browser/profiles/profile_io_data.cc | 2 +- chrome/browser/profiles/profile_manager.cc | 2 +- .../renderer_host/chrome_render_message_filter.cc | 2 +- .../pepper_isolated_file_system_message_filter.cc | 2 +- chrome/browser/services/gcm/gcm_profile_service.cc | 2 +- .../extension_api/tts_engine_extension_api.cc | 2 +- .../speech/extension_api/tts_extension_apitest.cc | 2 +- chrome/browser/speech/tts_controller.cc | 2 +- .../sync/glue/extension_data_type_controller.cc | 2 +- .../glue/extension_setting_data_type_controller.cc | 2 +- .../sync/glue/theme_data_type_controller.cc | 3 +- .../sync/profile_sync_components_factory_impl.cc | 5 +- .../sync/test/integration/sync_app_helper.cc | 2 +- .../sync/test/integration/sync_app_list_helper.cc | 2 +- .../sync/test/integration/sync_extension_helper.cc | 2 +- .../integration/two_client_app_list_sync_test.cc | 3 +- .../sync_file_system/drive_backend/sync_engine.cc | 2 +- .../drive_backend_v1/drive_file_sync_service.cc | 2 +- .../local/local_file_sync_service.cc | 2 +- .../tab_contents/render_view_context_menu.cc | 2 +- .../extension_process_resource_provider.cc | 2 +- chrome/browser/task_manager/task_manager.cc | 2 +- .../task_manager/task_manager_browsertest.cc | 2 +- chrome/browser/themes/theme_service.cc | 2 +- chrome/browser/themes/theme_syncable_service.cc | 2 +- .../ui/app_list/app_list_controller_delegate.cc | 2 +- .../app_list/app_list_controller_delegate_impl.cc | 2 +- chrome/browser/ui/app_list/app_list_service_mac.mm | 2 +- .../ui/app_list/app_list_syncable_service.cc | 2 +- .../app_list/app_list_syncable_service_factory.cc | 2 +- chrome/browser/ui/app_list/extension_app_item.cc | 2 +- .../ui/app_list/extension_app_model_builder.cc | 2 +- .../browser/ui/app_list/extension_uninstaller.cc | 2 +- chrome/browser/ui/app_list/recommended_apps.cc | 1 + .../ui/app_list/search/app_search_provider.cc | 2 +- .../ui/app_list/search/people/people_result.cc | 2 +- .../ui/app_list/search/webstore/webstore_result.cc | 2 +- .../app_modal_dialogs/javascript_dialog_manager.cc | 4 +- chrome/browser/ui/ash/app_sync_ui_state.cc | 2 +- .../ui/ash/ash_keyboard_controller_proxy.cc | 7 +- .../ui/ash/chrome_new_window_delegate_chromeos.cc | 2 +- .../app_shortcut_launcher_item_controller.cc | 2 +- .../ui/ash/launcher/chrome_launcher_controller.cc | 2 +- .../chrome_launcher_controller_browsertest.cc | 2 +- chrome/browser/ui/browser.cc | 2 +- chrome/browser/ui/browser_browsertest.cc | 2 +- .../cocoa/extensions/browser_actions_controller.mm | 2 +- .../extension_action_context_menu_controller.mm | 2 +- chrome/browser/ui/extensions/application_launch.cc | 2 +- .../browser/ui/extensions/extension_enable_flow.cc | 3 +- .../browser/ui/gtk/browser_actions_toolbar_gtk.cc | 2 +- chrome/browser/ui/media_utils.cc | 3 +- chrome/browser/ui/omnibox/location_bar.cc | 5 +- chrome/browser/ui/panels/panel.cc | 2 +- .../startup/startup_browser_creator_browsertest.cc | 2 +- .../ui/startup/startup_browser_creator_impl.cc | 2 +- .../ui/sync/profile_signin_confirmation_helper.cc | 2 +- .../extensions/extension_message_bubble_view.cc | 2 +- .../ui/views/select_file_dialog_extension.cc | 2 +- .../ui/views/toolbar/browser_actions_container.cc | 2 +- chrome/browser/ui/views/toolbar/site_chip_view.cc | 2 +- .../ui/webui/app_list/start_page_handler.cc | 2 +- chrome/browser/ui/webui/downloads_dom_handler.cc | 2 +- .../browser/ui/webui/extensions/command_handler.cc | 2 +- .../ui/webui/extensions/extension_error_handler.cc | 2 +- .../ui/webui/extensions/extension_icon_source.cc | 2 +- .../ui/webui/extensions/extension_info_ui.cc | 2 +- .../extensions/extension_settings_browsertest.cc | 2 +- .../webui/extensions/extension_settings_handler.cc | 2 +- .../webui/extensions/install_extension_handler.cc | 2 +- .../ui/webui/net_internals/net_internals_ui.cc | 2 +- .../browser/ui/webui/ntp/app_launcher_handler.cc | 2 +- .../chromeos/cros_language_options_handler.cc | 2 +- .../ui/webui/options/core_options_handler.cc | 2 +- .../ui/webui/options/font_settings_handler.cc | 2 +- .../webui/options/search_engine_manager_handler.cc | 2 +- chrome/browser/ui/webui/policy_ui.cc | 2 +- .../extension_statuses_handler.cc | 4 +- chrome/chrome_browser_extensions.gypi | 4 +- chrome/test/base/testing_profile.cc | 2 +- extensions/browser/DEPS | 2 +- extensions/browser/event_router.cc | 21 +- extensions/browser/extension_system.cc | 22 + extensions/browser/extension_system.h | 127 ++++++ extensions/browser/lazy_background_task_queue.cc | 8 +- extensions/browser/process_manager.cc | 13 +- extensions/extensions.gyp | 2 + 339 files changed, 1163 insertions(+), 1149 deletions(-) delete mode 100644 chrome/browser/extensions/extension_system.cc delete mode 100644 chrome/browser/extensions/extension_system.h create mode 100644 chrome/browser/extensions/extension_system_impl.cc create mode 100644 chrome/browser/extensions/extension_system_impl.h create mode 100644 extensions/browser/extension_system.cc create mode 100644 extensions/browser/extension_system.h diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc index 071f95e..a64cffc 100644 --- a/apps/app_load_service.cc +++ b/apps/app_load_service.cc @@ -10,13 +10,13 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using extensions::Extension; @@ -54,7 +54,7 @@ bool AppLoadService::LoadAndLaunch(const base::FilePath& extension_path, const CommandLine& command_line, const base::FilePath& current_dir) { ExtensionService* extension_service = - ExtensionSystem::GetForBrowserContext(profile_)->extension_service(); + ExtensionSystem::Get(profile_)->extension_service(); std::string extension_id; if (!extensions::UnpackedInstaller::Create(extension_service)-> LoadFromCommandLine(base::FilePath(extension_path), &extension_id)) { diff --git a/apps/launcher.cc b/apps/launcher.cc index 3733da7..599f5f9 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_runtime.h" #include "chrome/common/extensions/extension_messages.h" @@ -25,6 +24,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index 346ca4c..f6050d7 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -15,6 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_set.h" diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc index ebe94c1..f6add9c 100644 --- a/apps/saved_files_service_unittest.cc +++ b/apps/saved_files_service_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/extensions/test_extension_environment.h" #include "chrome/test/base/testing_profile.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/apps/shell/shell_browser_main_parts.cc b/apps/shell/shell_browser_main_parts.cc index c8dd2a1..e10c857 100644 --- a/apps/shell/shell_browser_main_parts.cc +++ b/apps/shell/shell_browser_main_parts.cc @@ -13,10 +13,10 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/chrome_paths.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/common/result_codes.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/renderer_startup_helper.h" #include "extensions/common/extension_paths.h" #include "ui/aura/env.h" @@ -170,7 +170,7 @@ void ShellBrowserMainParts::DestroyRootWindow() { void ShellBrowserMainParts::CreateExtensionSystem() { DCHECK(browser_context_); extension_system_ = static_cast( - ExtensionSystem::GetForBrowserContext(browser_context_.get())); + ExtensionSystem::Get(browser_context_.get())); extension_system_->InitForRegularProfile(true); } diff --git a/apps/shell/shell_extension_system.h b/apps/shell/shell_extension_system.h index e970944..62dd752 100644 --- a/apps/shell/shell_extension_system.h +++ b/apps/shell/shell_extension_system.h @@ -8,7 +8,7 @@ #include #include "base/compiler_specific.h" -#include "chrome/browser/extensions/extension_system.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/one_shot_event.h" class BrowserContextKeyedServiceFactory; diff --git a/apps/shell_window.cc b/apps/shell_window.cc index 9fef5c4..9c0247a 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/lifetime/application_lifetime.h" @@ -32,6 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/media_stream_request.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc index 68cd68f..7de9bd7 100644 --- a/chrome/browser/accessibility/accessibility_extension_api.cc +++ b/chrome/browser/accessibility/accessibility_extension_api.cc @@ -11,7 +11,6 @@ #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" @@ -20,6 +19,7 @@ #include "chrome/common/extensions/api/experimental_accessibility.h" #include "content/public/browser/browser_accessibility_state.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 3b521c6..9a72698 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -28,7 +28,6 @@ #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/printing/print_dialog_cloud.h" @@ -85,6 +84,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_system.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index a871a1f..6bf8f1f 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -22,7 +22,6 @@ #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" @@ -43,6 +42,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/test/test_utils.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" diff --git a/chrome/browser/apps/app_launch_for_metro_restart_win.cc b/chrome/browser/apps/app_launch_for_metro_restart_win.cc index a55cb33..f4e8a1d 100644 --- a/chrome/browser/apps/app_launch_for_metro_restart_win.cc +++ b/chrome/browser/apps/app_launch_for_metro_restart_win.cc @@ -15,10 +15,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/extension_system.h" #include "win8/util/win8_util.h" using extensions::Extension; diff --git a/chrome/browser/apps/ephemeral_app_browsertest.cc b/chrome/browser/apps/ephemeral_app_browsertest.cc index d4f26b0..798a725 100644 --- a/chrome/browser/apps/ephemeral_app_browsertest.cc +++ b/chrome/browser/apps/ephemeral_app_browsertest.cc @@ -4,12 +4,12 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/common/extensions/api/alarms.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_utils.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/apps/ephemeral_app_launcher.cc b/chrome/browser/apps/ephemeral_app_launcher.cc index 6feee8e..9d37b76 100644 --- a/chrome/browser/apps/ephemeral_app_launcher.cc +++ b/chrome/browser/apps/ephemeral_app_launcher.cc @@ -7,7 +7,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/extensions/application_launch.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/permissions/permissions_data.h" using content::WebContents; diff --git a/chrome/browser/apps/ephemeral_app_service.cc b/chrome/browser/apps/ephemeral_app_service.cc index 1a526bc..c658f29 100644 --- a/chrome/browser/apps/ephemeral_app_service.cc +++ b/chrome/browser/apps/ephemeral_app_service.cc @@ -8,7 +8,6 @@ #include "chrome/browser/apps/ephemeral_app_service_factory.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" @@ -16,6 +15,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/apps/ephemeral_app_service_browsertest.cc b/chrome/browser/apps/ephemeral_app_service_browsertest.cc index 24f7f15..d211b9c 100644 --- a/chrome/browser/apps/ephemeral_app_service_browsertest.cc +++ b/chrome/browser/apps/ephemeral_app_service_browsertest.cc @@ -7,10 +7,10 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/apps/ephemeral_app_service.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/manifest.h" using extensions::PlatformAppBrowserTest; diff --git a/chrome/browser/apps/ephemeral_app_throttle.cc b/chrome/browser/apps/ephemeral_app_throttle.cc index 655d36f..1ebdd3b 100644 --- a/chrome/browser/apps/ephemeral_app_throttle.cc +++ b/chrome/browser/apps/ephemeral_app_throttle.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "chrome/browser/apps/ephemeral_app_launcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/chrome_switches.h" @@ -17,6 +16,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_throttle.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "net/url_request/url_request.h" using content::BrowserThread; diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc index a06141d..f63d3e0 100644 --- a/chrome/browser/apps/shortcut_manager.cc +++ b/chrome/browser/apps/shortcut_manager.cc @@ -13,7 +13,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" @@ -26,6 +25,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index 4687bde..dc5445d 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -46,8 +46,7 @@ void ExtensionAppProvider::LaunchAppFromOmnibox( Profile* profile, WindowOpenDisposition disposition) { ExtensionService* service = - extensions::ExtensionSystemFactory::GetForProfile(profile)-> - extension_service(); + extensions::ExtensionSystem::Get(profile)->extension_service(); const extensions::Extension* extension = service->GetInstalledApp(match.destination_url); // While the Omnibox popup is open, the extension can be updated, changing @@ -150,8 +149,7 @@ ExtensionAppProvider::~ExtensionAppProvider() { void ExtensionAppProvider::RefreshAppList() { ExtensionService* extension_service = - extensions::ExtensionSystemFactory::GetForProfile(profile_)-> - extension_service(); + extensions::ExtensionSystem::Get(profile_)->extension_service(); if (!extension_service) return; // During testing, there is no extension service. const extensions::ExtensionSet* extensions = extension_service->extensions(); diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index ae14a66..a4424dc 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -23,6 +22,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_util.h" diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc index b10baaa..98a4b13 100644 --- a/chrome/browser/automation/automation_provider_json.cc +++ b/chrome/browser/automation/automation_provider_json.cc @@ -11,10 +11,10 @@ #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/automation_messages.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using content::WebContents; diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 95f4e31..8619776 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -33,7 +33,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/top_sites.h" @@ -72,6 +71,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/process_type.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/runtime_data.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 3627ba8..c97f46e 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -16,7 +16,6 @@ #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_json.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/sessions/session_tab_helper.h" @@ -30,6 +29,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 2ad67fe..36c9f9c 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -55,7 +55,6 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/launch_util.h" @@ -136,6 +135,7 @@ #include "content/public/common/geoposition.h" #include "content/public/common/ssl_status.h" #include "content/public/common/webplugininfo.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 9a5a858..34f273c 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -18,7 +18,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_constants.h" @@ -28,6 +27,7 @@ #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index d52ed8a..34b0ae4 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -16,11 +16,11 @@ #include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_unittest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index 337141f..dd03caa 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -21,7 +21,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification.h" @@ -41,6 +40,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index 36ca602..9f26f62 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -20,7 +20,6 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" @@ -41,6 +40,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "grit/chrome_unscaled_resources.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index a6b3cd0..9278f1c 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -54,7 +54,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/startup_helper.h" #include "chrome/browser/feedback/feedback_profile_observer.h" #include "chrome/browser/first_run/first_run.h" @@ -129,6 +128,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" +#include "extensions/browser/extension_system.h" #include "grit/app_locale_settings.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 6eade324b..19e3f05 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -36,7 +36,6 @@ #include "chrome/browser/extensions/browser_permissions_policy_delegate.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/extension_webkit_preferences.h" #include "chrome/browser/extensions/suggest_permission_util.h" @@ -125,6 +124,7 @@ #include "content/public/common/content_descriptors.h" #include "content/public/common/url_utils.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" @@ -1350,8 +1350,7 @@ void ChromeContentBrowserClient::WorkerProcessCreated( if (!extension) return; extensions::ExtensionSystem* extension_system = - extensions::ExtensionSystem::GetForBrowserContext( - site_instance->GetBrowserContext()); + extensions::ExtensionSystem::Get(site_instance->GetBrowserContext()); extension_system->info_map()->RegisterExtensionWorkerProcess( extension->id(), worker_process_id, @@ -1362,8 +1361,7 @@ void ChromeContentBrowserClient::WorkerProcessTerminated( SiteInstance* site_instance, int worker_process_id) { extensions::ExtensionSystem* extension_system = - extensions::ExtensionSystem::GetForBrowserContext( - site_instance->GetBrowserContext()); + extensions::ExtensionSystem::Get(site_instance->GetBrowserContext()); extension_system->info_map()->UnregisterExtensionWorkerProcess( worker_process_id); } diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 60c024a..833e71e 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc @@ -33,7 +33,6 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/speech/tts_controller.h" @@ -53,6 +52,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/file_reader.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h index a5ef522..9ee8df5 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.h +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h @@ -14,10 +14,10 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/accessibility/accessibility_util.h" #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h" -#include "chrome/browser/extensions/extension_system.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" class Profile; diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc index 06d1702..05a0a89 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/extensions/webstore_data_fetcher.h" #include "chrome/browser/extensions/webstore_install_helper.h" @@ -27,6 +26,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "ui/gfx/codec/png_codec.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 9b27631..8fa202a 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,11 @@ #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.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/common/extension.h" namespace chromeos { diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc index 5d1db9f..2ebc89d 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/updater/manifest_fetch_data.h" #include "chrome/browser/extensions/updater/safe_manifest_parser.h" #include "chrome/browser/extensions/webstore_startup_installer.h" @@ -31,6 +30,7 @@ #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/kiosk_mode_info.h" #include "google_apis/gaia/gaia_auth_consumer.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc index ce4c9b0..ff5f5b5 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc @@ -27,7 +27,6 @@ #include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" @@ -37,6 +36,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index e4513e0..9c790e0 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -10,8 +10,8 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_function_registry.h" -#include "chrome/browser/extensions/extension_system.h" #include "chromeos/ime/input_method_manager.h" +#include "extensions/browser/extension_system.h" namespace { @@ -63,7 +63,7 @@ bool StartImeFunction::RunImpl() { InputMethodAPI::InputMethodAPI(content::BrowserContext* context) : context_(context) { - ExtensionSystem::GetForBrowserContext(context_)->event_router()-> + ExtensionSystem::Get(context_)->event_router()-> RegisterObserver(this, event_names::kOnInputMethodChanged); ExtensionFunctionRegistry* registry = ExtensionFunctionRegistry::GetInstance(); @@ -84,8 +84,7 @@ std::string InputMethodAPI::GetInputMethodForXkb(const std::string& xkb_id) { void InputMethodAPI::Shutdown() { // UnregisterObserver may have already been called in OnListenerAdded, // but it is safe to call it more than once. - ExtensionSystem::GetForBrowserContext(context_)->event_router()-> - UnregisterObserver(this); + ExtensionSystem::Get(context_)->event_router()->UnregisterObserver(this); } void InputMethodAPI::OnListenerAdded( @@ -93,8 +92,7 @@ void InputMethodAPI::OnListenerAdded( DCHECK(!input_method_event_router_.get()); input_method_event_router_.reset( new chromeos::ExtensionInputMethodEventRouter(context_)); - ExtensionSystem::GetForBrowserContext(context_)->event_router()-> - UnregisterObserver(this); + ExtensionSystem::Get(context_)->event_router()->UnregisterObserver(this); } static base::LazyInstance > diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc index 5f061bc..069d3ff5 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.cc +++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc @@ -10,9 +10,9 @@ #include "base/values.h" #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/extension_system.h" #include "content/public/browser/browser_context.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace chromeos { @@ -30,8 +30,7 @@ void ExtensionInputMethodEventRouter::InputMethodChanged( input_method::InputMethodManager *manager, bool show_message) { extensions::EventRouter *router = - extensions::ExtensionSystem::GetForBrowserContext(context_)-> - event_router(); + extensions::ExtensionSystem::Get(context_)->event_router(); if (!router->HasEventListener(extensions::event_names::kOnInputMethodChanged)) return; diff --git a/chrome/browser/chromeos/extensions/media_player_event_router.cc b/chrome/browser/chromeos/extensions/media_player_event_router.cc index 179d858..c5b622f 100644 --- a/chrome/browser/chromeos/extensions/media_player_event_router.cc +++ b/chrome/browser/chromeos/extensions/media_player_event_router.cc @@ -5,9 +5,9 @@ #include "chrome/browser/chromeos/extensions/media_player_event_router.h" #include "base/memory/singleton.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/chromeos/extensions/screenlock_private_api.cc b/chrome/browser/chromeos/extensions/screenlock_private_api.cc index 9fc6b8f..c009fce 100644 --- a/chrome/browser/chromeos/extensions/screenlock_private_api.cc +++ b/chrome/browser/chromeos/extensions/screenlock_private_api.cc @@ -7,11 +7,11 @@ #include "base/lazy_instance.h" #include "base/values.h" #include "chrome/browser/chromeos/login/screen_locker.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/common/extensions/api/screenlock_private.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace screenlock = extensions::api::screenlock_private; diff --git a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc index 104ba1a..b3a3703 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc @@ -7,7 +7,6 @@ #include "ash/shell.h" #include "base/command_line.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" namespace wallpaper_manager_util { diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc index 7087115..07cc02b 100644 --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chromeos/fileapi/file_system_backend.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" @@ -26,6 +25,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc index 5cb3d8a..8f0442d 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks.cc @@ -18,13 +18,13 @@ #include "chrome/browser/drive/drive_app_registry.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc index 791fe2a..8c3958a 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc @@ -18,11 +18,11 @@ #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/drive/drive_app_registry.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_builder.h" #include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/file_manager/fileapi_util.cc b/chrome/browser/chromeos/file_manager/fileapi_util.cc index edad4fb..559b70c 100644 --- a/chrome/browser/chromeos/file_manager/fileapi_util.cc +++ b/chrome/browser/chromeos/file_manager/fileapi_util.cc @@ -7,12 +7,12 @@ #include "base/files/file_path.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/storage_partition.h" +#include "extensions/browser/extension_system.h" #include "net/base/escape.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_context.h" diff --git a/chrome/browser/chromeos/file_manager/open_util.cc b/chrome/browser/chromeos/file_manager/open_util.cc index 30fe1ac..14cebb3 100644 --- a/chrome/browser/chromeos/file_manager/open_util.cc +++ b/chrome/browser/chromeos/file_manager/open_util.cc @@ -17,7 +17,6 @@ #include "chrome/browser/chromeos/file_manager/url_util.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -28,6 +27,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_system.h" #include "google_apis/drive/task_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc index b4161c6..da4f118 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc @@ -11,11 +11,11 @@ #include "chrome/browser/chromeos/first_run/drive_first_run_controller.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_notification_observer.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_status_code.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc index e2a79ae..f93565b 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc @@ -16,7 +16,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/tab_contents/background_contents.h" #include "chrome/browser/ui/browser_navigator.h" @@ -33,6 +32,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc index 1e17dfc..b6f9aab 100644 --- a/chrome/browser/chromeos/first_run/first_run.cc +++ b/chrome/browser/chromeos/first_run/first_run.cc @@ -8,7 +8,6 @@ #include "chrome/browser/chromeos/first_run/first_run_controller.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc index deef551..1db74fc 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc index 44afec4..ed7f799e 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc @@ -20,7 +20,6 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/sandboxed_unpacker.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/extensions/extension_file_util.h" @@ -28,6 +27,7 @@ #include "chromeos/login/login_state.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc index 8a58db6..34ea3ba 100644 --- a/chrome/browser/chromeos/login/help_app_launcher.cc +++ b/chrome/browser/chromeos/login/help_app_launcher.cc @@ -11,8 +11,8 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index 080d94f..352c61e 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -23,7 +23,6 @@ #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -32,6 +31,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_switches.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index 417fff5..6e5c042 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/chromeos/login/login_display_host_impl.h" #include "chrome/browser/chromeos/login/login_wizard.h" #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" @@ -23,6 +22,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/merge_session_load_page.cc index d21c26f..993242f 100644 --- a/chrome/browser/chromeos/login/merge_session_load_page.cc +++ b/chrome/browser/chromeos/login/merge_session_load_page.cc @@ -16,7 +16,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" @@ -27,6 +26,7 @@ #include "content/public/browser/interstitial_page.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 84ee635..9f0c5c5 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -18,7 +18,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" @@ -32,6 +31,7 @@ #include "content/public/browser/interstitial_page.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 14cc32e..93deb6f 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -53,7 +53,6 @@ #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" @@ -90,6 +89,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "crypto/rsa_private_key.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index bdb8796..5b28014 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" @@ -49,6 +48,7 @@ #include "content/public/browser/worker_service_observer.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/switches.h" #include "net/socket/tcp_listen_socket.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/chrome/browser/devtools/devtools_target_impl.cc b/chrome/browser/devtools/devtools_target_impl.cc index 8a406c9..767cad0 100644 --- a/chrome/browser/devtools/devtools_target_impl.cc +++ b/chrome/browser/devtools/devtools_target_impl.cc @@ -9,7 +9,6 @@ #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" @@ -20,6 +19,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" using content::BrowserThread; using content::DevToolsAgentHost; diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index ce6f496..0ebd514 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/devtools/devtools_window.h" + #include #include "base/command_line.h" @@ -18,7 +19,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/debugger/debugger_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" @@ -64,6 +64,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index b1edde2..123c8fb 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -38,7 +38,6 @@ #include "chrome/browser/download/download_test_file_activity_observer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/history/download_row.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" @@ -81,6 +80,7 @@ #include "content/public/test/test_navigation_observer.h" #include "content/test/net/url_request_mock_http_job.h" #include "content/test/net/url_request_slow_download_job.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/download/download_crx_util.cc b/chrome/browser/download/download_crx_util.cc index f6edf37..9ba1ffd 100644 --- a/chrome/browser/download/download_crx_util.cc +++ b/chrome/browser/download/download_crx_util.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/download_item.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/user_script.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc index dd4d3e6..d7e00b0 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/active_tab_permission_granter.cc @@ -6,7 +6,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/common/extensions/extension_messages.h" @@ -16,6 +15,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index a9a598f..50a007d 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.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/install_tracker_factory.h" @@ -32,6 +31,7 @@ #include "chrome/common/pref_names.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "third_party/re2/re2/re2.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index 8ac6eab..ac78caa 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc @@ -5,12 +5,12 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index 2069001..8b59028 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc @@ -5,12 +5,12 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" #include "extensions/common/id_util.h" 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 8036807..1b7a2a9 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 @@ -11,10 +11,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/activity_log_private.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc index 1f260a5..0fc8e27 100644 --- a/chrome/browser/extensions/api/alarms/alarm_manager.cc +++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc @@ -15,12 +15,12 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/alarms.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/api_function.cc b/chrome/browser/extensions/api/api_function.cc index f3c2d9f..54bf8e3 100644 --- a/chrome/browser/extensions/api/api_function.cc +++ b/chrome/browser/extensions/api/api_function.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/api_function.h" #include "base/bind.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc index f893777..55818f1 100644 --- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc +++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc @@ -12,12 +12,12 @@ #include "base/values.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_runtime.h" #include "content/public/browser/web_contents.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 "url/gurl.h" diff --git a/chrome/browser/extensions/api/audio/audio_api.cc b/chrome/browser/extensions/api/audio/audio_api.cc index 04ad3f1..bae1eff 100644 --- a/chrome/browser/extensions/api/audio/audio_api.cc +++ b/chrome/browser/extensions/api/audio/audio_api.cc @@ -6,9 +6,9 @@ #include "base/lazy_instance.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/audio.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc index e51bf34..1f1fa23 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc @@ -9,12 +9,12 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/autotest_private.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc index 5790a70..f921021 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc @@ -11,7 +11,6 @@ #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/bluetooth.h" #include "chrome/common/extensions/permissions/bluetooth_permission.h" @@ -24,6 +23,7 @@ #include "device/bluetooth/bluetooth_socket.h" #include "device/bluetooth/bluetooth_utils.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/permissions/permissions_data.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc index a21ac8b..73123da 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc @@ -16,7 +16,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/bluetooth.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" @@ -26,6 +26,7 @@ #include "device/bluetooth/bluetooth_profile.h" #include "device/bluetooth/bluetooth_socket.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 03f3f5d..c01e3c1 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" @@ -35,6 +34,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index e8e1802..d08796c 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -28,7 +28,6 @@ #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/importer_uma.h" #include "chrome/browser/platform_util.h" @@ -44,6 +43,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/quota_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc index 2a96f9d..16f0e88 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc @@ -6,9 +6,9 @@ #include "base/lazy_instance.h" #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "extensions/browser/extension_system.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/screen_locker.h" diff --git a/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc b/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc index 335ff5b..8b83592 100644 --- a/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc +++ b/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc @@ -9,11 +9,11 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/cast_channel/cast_socket.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "net/base/net_errors.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc index 88fe184..4c2906d 100644 --- a/chrome/browser/extensions/api/commands/command_service.cc +++ b/chrome/browser/extensions/api/commands/command_service.cc @@ -17,7 +17,6 @@ #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/accelerator_utils.h" #include "chrome/common/extensions/api/commands/commands_handler.h" @@ -25,6 +24,7 @@ #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index db3e637..9c50ebe 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc @@ -20,13 +20,13 @@ #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/plugins/plugin_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/content_settings.h" #include "content/public/browser/plugin_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index 3505fba..7446484e 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/cookies/cookies_api_constants.h" #include "chrome/browser/extensions/api/cookies/cookies_helpers.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" @@ -26,6 +25,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index ec07c42..e965066 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" @@ -44,6 +43,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/url_utils.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/api/declarative/rules_cache_delegate.cc b/chrome/browser/extensions/api/declarative/rules_cache_delegate.cc index bc3778b..d4bfcc6 100644 --- a/chrome/browser/extensions/api/declarative/rules_cache_delegate.cc +++ b/chrome/browser/extensions/api/declarative/rules_cache_delegate.cc @@ -7,12 +7,12 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/declarative/rules_registry.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" namespace { diff --git a/chrome/browser/extensions/api/declarative/rules_registry.cc b/chrome/browser/extensions/api/declarative/rules_registry.cc index 897f85a..0d6375a 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry.cc @@ -17,7 +17,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/declarative/rules_cache_delegate.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/profiles/profile.h" @@ -25,6 +24,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc index 8a68573..cf27969 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.cc +++ b/chrome/browser/extensions/api/declarative_content/content_action.cc @@ -13,10 +13,11 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" +#include "chrome/browser/profiles/profile.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc index 5c76c37..d1b315c 100644 --- a/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc +++ b/chrome/browser/extensions/api/declarative_content/content_rules_registry.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/api/declarative_content/content_condition.h" #include "chrome/browser/extensions/api/declarative_content/content_constants.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_messages.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" using url_matcher::URLMatcherConditionSet; diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc index 8cd1595..189a441 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc @@ -14,7 +14,8 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_permissions.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 7b3a8bb..638021d 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -27,7 +27,6 @@ #include "chrome/browser/extensions/extension_disabled_ui.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_updater.h" @@ -50,6 +49,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc index c5416d2..5339c16 100644 --- a/chrome/browser/extensions/api/dial/dial_api.cc +++ b/chrome/browser/extensions/api/dial/dial_api.cc @@ -8,11 +8,11 @@ #include "base/time/time.h" #include "chrome/browser/extensions/api/dial/dial_api_factory.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/dial.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" using base::TimeDelta; using content::BrowserThread; diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 5cb5d3a..e9bee6c 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -40,7 +40,6 @@ #include "chrome/browser/download/drag_download_item.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_warning_service.h" #include "chrome/browser/extensions/extension_warning_set.h" #include "chrome/browser/icon_loader.h" @@ -70,6 +69,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/permissions_data.h" #include "net/base/load_flags.h" @@ -900,7 +900,7 @@ void OnDeterminingFilenameWillDispatchCallback( const extensions::Extension* extension, base::ListValue* event_args) { *any_determiners = true; - base::Time installed = extensions::ExtensionSystem::GetForBrowserContext( + base::Time installed = extensions::ExtensionSystem::Get( context)->extension_service()->extension_prefs()-> GetInstallTime(extension->id()); data->AddPendingDeterminer(extension->id(), installed); diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index 5840e05..3d63e47 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/profiles/profile.h" @@ -28,12 +27,13 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" using content::WebContents; diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index f7d7927..5fd505d 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser_commands.h" @@ -18,6 +17,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index a7e0775..f34a0f7 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/location_bar_controller.h" @@ -28,6 +27,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc index 144d3bc..81bbc14 100644 --- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" @@ -20,6 +19,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using content::WebContents; diff --git a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc index 11fef26..5a89193 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/api/feedback_private.h" @@ -18,6 +17,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/content_switches.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" using apps::ShellWindow; using apps::ShellWindowRegistry; diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index ae0e941..3708575 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -11,9 +11,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/feedback_private/feedback_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/feedback/tracing_manager.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index 6ad9a61f..81db020 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -20,7 +20,6 @@ #include "base/values.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/apps/directory_access_confirmation_dialog.h" @@ -33,6 +32,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/permissions/api_permission.h" #include "grit/generated_resources.h" #include "net/base/mime_util.h" diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc index 9d3e9dd..398ff8d 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/api/preference/preference_api.h" #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/font_settings.h" #include "chrome/common/pref_names.h" @@ -26,6 +25,7 @@ #include "content/public/browser/font_list_async.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc index 2034c40..d4f1b78 100644 --- a/chrome/browser/extensions/api/gcm/gcm_api.cc +++ b/chrome/browser/extensions/api/gcm/gcm_api.cc @@ -10,13 +10,13 @@ #include "base/sha1.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/services/gcm/gcm_profile_service.h" #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "chrome/common/extensions/api/gcm.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index e95119b..70eeeba 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -19,7 +19,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/activity_log/activity_log.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" @@ -31,6 +30,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/identity/account_tracker.cc b/chrome/browser/extensions/api/identity/account_tracker.cc index 54d6282..d5d80ce 100644 --- a/chrome/browser/extensions/api/identity/account_tracker.cc +++ b/chrome/browser/extensions/api/identity/account_tracker.cc @@ -8,12 +8,12 @@ #include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.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" #include "chrome/browser/signin/signin_manager_base.h" #include "content/public/browser/notification_details.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 09796862..c1444b1 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -19,7 +19,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.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" @@ -29,6 +28,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "google_apis/gaia/gaia_urls.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc index 21973824cf..5f51614 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc @@ -12,8 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/identity_private.h" #include "chrome/common/extensions/extension_constants.h" @@ -28,6 +26,7 @@ #include "content/public/browser/web_contents.h" #include "crypto/random.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "grit/browser_resources.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index 8630bca..e0651cb 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -9,13 +9,13 @@ #include "base/stl_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/idle/idle_api_constants.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/idle.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace keys = extensions::idle_api_constants; 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 62409e4..839e155 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc @@ -14,11 +14,11 @@ #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.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" +#include "extensions/browser/extension_system.h" namespace image_writer_api = extensions::api::image_writer_private; diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index adb2922..07670fe 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -9,13 +9,13 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h" #include "chrome/browser/extensions/extension_function_registry.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/input_ime.h" #include "chrome/common/extensions/api/input_ime/input_components_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace input_ime = extensions::api::input_ime; namespace KeyEventHandled = extensions::api::input_ime::KeyEventHandled; diff --git a/chrome/browser/extensions/api/location/location_manager.cc b/chrome/browser/extensions/api/location/location_manager.cc index 6767e3a..28d2ead 100644 --- a/chrome/browser/extensions/api/location/location_manager.cc +++ b/chrome/browser/extensions/api/location/location_manager.cc @@ -11,7 +11,6 @@ #include "base/lazy_instance.h" #include "base/time/time.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/location.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/geolocation_provider.h" @@ -19,6 +18,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/common/geoposition.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 35fd8ca..da1e529 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -22,7 +22,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/management/management_api_constants.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/profiles/profile.h" @@ -41,6 +40,7 @@ #include "content/public/browser/utility_process_host_client.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index 0f1e15d..ff0c7fc 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -23,6 +22,7 @@ #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" namespace keys = extension_management_api_constants; namespace util = extension_function_test_utils; diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc index facca8f..3a99f51 100644 --- a/chrome/browser/extensions/api/management/management_apitest.cc +++ b/chrome/browser/extensions/api/management/management_apitest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/api/management/management_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/test_management_policy.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index ce3bf76..5165ecf 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/updater/extension_downloader.h" @@ -26,6 +25,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/browser_test_utils.h" #include "content/test/net/url_request_prepackaged_interceptor.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/extensions/api/mdns/mdns_api.cc b/chrome/browser/extensions/api/mdns/mdns_api.cc index 603d486..05ef707 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.cc +++ b/chrome/browser/extensions/api/mdns/mdns_api.cc @@ -8,8 +8,8 @@ #include "base/lazy_instance.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/mdns.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc index 299042e..a1c6cf0 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc @@ -13,7 +13,6 @@ #include "base/values.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" @@ -21,6 +20,7 @@ #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/common/chrome_paths.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #if defined(OS_WIN) || defined(OS_MACOSX) #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc index ea1cc20..812e6e2 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h" #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" @@ -26,6 +25,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index 6d5ee30..18b9208 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" @@ -27,6 +26,7 @@ #include "content/public/browser/render_view_host.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_function.h" +#include "extensions/browser/extension_system.h" using base::DictionaryValue; using base::ListValue; diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc index e6757f2..22b4bc0 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/storage_monitor.h" @@ -18,6 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc index 9a7e007..2bb83c1 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc @@ -11,12 +11,12 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/common/extensions/api/media_galleries_private.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace media_galleries_private = extensions::api::media_galleries_private; diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index 9f83c21..5a16da4 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -11,12 +11,12 @@ #include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/messaging/extension_message_port.cc b/chrome/browser/extensions/api/messaging/extension_message_port.cc index e07deae..894fab4 100644 --- a/chrome/browser/extensions/api/messaging/extension_message_port.cc +++ b/chrome/browser/extensions/api/messaging/extension_message_port.cc @@ -5,10 +5,10 @@ #include "chrome/browser/extensions/api/messaging/extension_message_port.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/render_process_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc index 81577f8..8afd54f 100644 --- a/chrome/browser/extensions/api/messaging/message_service.cc +++ b/chrome/browser/extensions/api/messaging/message_service.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/api/messaging/native_message_port.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" @@ -32,6 +31,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/api/module/module.cc b/chrome/browser/extensions/api/module/module.cc index 049220e..87b2d33 100644 --- a/chrome/browser/extensions/api/module/module.cc +++ b/chrome/browser/extensions/api/module/module.cc @@ -8,11 +8,11 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc index b09f6e8c..3f54df2 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc @@ -13,11 +13,11 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_service_client.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h" #include "chrome/browser/extensions/extension_function_registry.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/networking_private.h" #include "components/onc/onc_constants.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" using extensions::NetworkingPrivateServiceClient; using extensions::NetworkingPrivateServiceClientFactory; diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc index adf110c..0aefa24 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc @@ -8,7 +8,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/networking_private/networking_private_api.h" #include "chrome/browser/extensions/event_router_forwarder.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/networking_private.h" @@ -20,6 +19,7 @@ #include "chromeos/network/onc/onc_translator.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/onc/onc_constants.h" +#include "extensions/browser/extension_system.h" #include "third_party/cros_system_api/dbus/service_constants.h" using chromeos::NetworkHandler; diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc index 0d242e2..2c44dd0 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc @@ -7,9 +7,9 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_api.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/networking_private.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 5b266e8..a950e1d 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -12,15 +12,16 @@ #include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_version_info.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 5435461..eb378f0 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -12,7 +12,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -24,6 +23,7 @@ #include "content/public/browser/notification_service.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 "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 2c98bed..a36924b 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "chrome/browser/extensions/api/proxy/proxy_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" @@ -26,6 +25,7 @@ #include "extensions/browser/extension_pref_value_map.h" #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/pref_names.h" #include "extensions/common/error_utils.h" #include "extensions/common/permissions/api_permission.h" diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc index 9a1d356..fe55fd7 100644 --- a/chrome/browser/extensions/api/preference/preference_helpers.cc +++ b/chrome/browser/extensions/api/preference/preference_helpers.cc @@ -9,11 +9,11 @@ #include "base/values.h" #include "chrome/browser/extensions/api/preference/preference_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/manifest_handlers/incognito_info.h" namespace extensions { diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index e4c0559..657a3bc 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_function_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/resource_provider.h" @@ -34,6 +33,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/error_utils.h" namespace extensions { 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 4923d58..651281c 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.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" @@ -29,6 +28,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/extensions/api/runtime/runtime_api.cc b/chrome/browser/extensions/api/runtime/runtime_api.cc index 11631ca..9953abe 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -28,6 +27,7 @@ #include "content/public/browser/render_view_host.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" @@ -90,8 +90,7 @@ void DispatchOnStartupEventImpl(BrowserContext* browser_context, if (ExtensionsBrowserClient::Get()->IsShuttingDown() || !ExtensionsBrowserClient::Get()->IsValidContext(browser_context)) return; - ExtensionSystem* system = - ExtensionSystem::GetForBrowserContext(browser_context); + ExtensionSystem* system = ExtensionSystem::Get(browser_context); if (!system) return; @@ -160,7 +159,7 @@ RuntimeAPI::RuntimeAPI(content::BrowserContext* context) RuntimeAPI::~RuntimeAPI() { if (registered_for_updates_) { - ExtensionSystem::GetForBrowserContext(browser_context_)-> + ExtensionSystem::Get(browser_context_)-> extension_service()->RemoveUpdateObserver(this); } } @@ -203,7 +202,7 @@ void RuntimeAPI::OnExtensionsReady() { registered_for_updates_ = true; - ExtensionSystem::GetForBrowserContext(browser_context_)->extension_service()-> + ExtensionSystem::Get(browser_context_)->extension_service()-> AddUpdateObserver(this); } @@ -228,7 +227,7 @@ void RuntimeAPI::OnExtensionInstalled(const Extension* extension) { return; // Get the previous version to check if this is an upgrade. - ExtensionService* service = ExtensionSystem::GetForBrowserContext( + ExtensionService* service = ExtensionSystem::Get( browser_context_)->extension_service(); const Extension* old = service->GetExtensionById(extension->id(), true); Version old_version; @@ -283,7 +282,7 @@ void RuntimeEventRouter::DispatchOnInstalledEvent( bool chrome_updated) { if (!ExtensionsBrowserClient::Get()->IsValidContext(context)) return; - ExtensionSystem* system = ExtensionSystem::GetForBrowserContext(context); + ExtensionSystem* system = ExtensionSystem::Get(context); if (!system) return; diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc index 73a1c8d..c2d6f5a 100644 --- a/chrome/browser/extensions/api/serial/serial_api.cc +++ b/chrome/browser/extensions/api/serial/serial_api.cc @@ -7,12 +7,12 @@ #include #include "base/values.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/api/serial/serial_connection.h" #include "chrome/browser/extensions/api/serial/serial_event_dispatcher.h" #include "chrome/browser/extensions/api/serial/serial_port_enumerator.h" #include "chrome/common/extensions/api/serial.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc b/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc index 329985a..54495d1 100644 --- a/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc +++ b/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/serial/serial_connection.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc index 17c6a41..6a365b5 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/device_info.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -27,6 +26,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using browser_sync::DeviceInfo; diff --git a/chrome/browser/extensions/api/socket/socket_api.cc b/chrome/browser/extensions/api/socket/socket_api.cc index 7354a49..5b77498 100644 --- a/chrome/browser/extensions/api/socket/socket_api.cc +++ b/chrome/browser/extensions/api/socket/socket_api.cc @@ -13,9 +13,9 @@ #include "chrome/browser/extensions/api/socket/socket.h" #include "chrome/browser/extensions/api/socket/tcp_socket.h" #include "chrome/browser/extensions/api/socket/udp_socket.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/io_thread.h" #include "chrome/common/extensions/permissions/socket_permission.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc b/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc index e7ef2fe..b0cf650 100644 --- a/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc +++ b/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/socket/tcp_socket.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "net/base/net_errors.h" namespace { diff --git a/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc b/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc index 691915d..91bb58b 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/socket/tcp_socket.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "net/base/net_errors.h" namespace extensions { diff --git a/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc b/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc index 5b24f25..cadb1dd 100644 --- a/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc +++ b/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/socket/udp_socket.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "net/base/net_errors.h" namespace extensions { diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 81977d0..f807565 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/api/storage/policy_value_store.h" #include "chrome/browser/extensions/api/storage/settings_storage_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" #include "chrome/browser/policy/schema_registry_service.h" @@ -33,6 +32,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index 2cf74da..2809543 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc @@ -12,12 +12,12 @@ #include "chrome/browser/extensions/api/storage/settings_sync_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/value_builder.h" #include "sync/api/sync_change.h" #include "sync/api/sync_change_processor.h" @@ -458,8 +458,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, IsStorageEnabled) { IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, ExtensionsSchemas) { // Verifies that the Schemas for the extensions domain are created on startup. Profile* profile = browser()->profile(); - ExtensionSystem* extension_system = - ExtensionSystemFactory::GetForProfile(profile); + ExtensionSystem* extension_system = ExtensionSystem::Get(profile); if (!extension_system->ready().is_signaled()) { // Wait until the extension system is ready. base::RunLoop run_loop; diff --git a/chrome/browser/extensions/api/storage/settings_frontend.cc b/chrome/browser/extensions/api/storage/settings_frontend.cc index 2a48bf3..45154ff 100644 --- a/chrome/browser/extensions/api/storage/settings_frontend.cc +++ b/chrome/browser/extensions/api/storage/settings_frontend.cc @@ -15,11 +15,11 @@ #include "chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/storage.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h" diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc index 7311b3e..1e54aaf 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc @@ -14,10 +14,10 @@ #include "chrome/browser/extensions/api/storage/settings_sync_util.h" #include "chrome/browser/extensions/api/storage/settings_test_util.h" #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/value_store/testing_value_store.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/manifest.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc index 6a2213a..2d69b27 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc @@ -11,13 +11,13 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_function_registry.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/stream_handle.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace events { diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc index 5bc5790..402b7e8 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc @@ -7,7 +7,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -22,6 +21,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/download_test_observer.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc index df7fe59..c5fe516 100644 --- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc +++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc @@ -7,13 +7,13 @@ #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/sync_event_observer.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "chrome/common/extensions/api/sync_file_system.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc index 381b607..8e58ca2 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc @@ -7,9 +7,9 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/ui/browser.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index 1950805..dd50c9a 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -9,7 +9,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/status_icons/status_icon.h" #include "chrome/browser/status_icons/status_icon_observer.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc index b4adbe0..654c073 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc @@ -10,13 +10,13 @@ #include "chrome/browser/extensions/api/system_storage/storage_api_test_util.h" #include "chrome/browser/extensions/api/system_storage/storage_info_provider.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc index 8160899..03420bf 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc @@ -6,7 +6,6 @@ #include "base/lazy_instance.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" @@ -18,6 +17,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc index b7c952d..edf2fb3 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" #include "chrome/browser/extensions/api/tabs/windows_event_router.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -24,6 +23,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" using base::DictionaryValue; using base::ListValue; diff --git a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc index 1fd9339..df6c640 100644 --- a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc @@ -7,10 +7,10 @@ #include "base/lazy_instance.h" #include "chrome/browser/extensions/api/tabs/tabs_event_router.h" #include "chrome/browser/extensions/api/tabs/windows_event_router.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/tabs.h" #include "chrome/common/extensions/api/windows.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc index de47d1f..e3d2113 100644 --- a/chrome/browser/extensions/api/tabs/windows_event_router.cc +++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc @@ -7,7 +7,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/window_controller.h" #include "chrome/browser/extensions/window_controller_list.h" @@ -16,6 +15,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #if defined(TOOLKIT_GTK) #include "ui/base/x/active_window_watcher_x.h" diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc index e183c56..16f19b9 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc +++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc @@ -10,12 +10,12 @@ #include "base/values.h" #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/terminal_private.h" #include "chromeos/process_proxy/process_proxy_registry.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" namespace terminal_private = extensions::api::terminal_private; namespace OnTerminalResize = diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc index 21b8156..84474e4 100644 --- a/chrome/browser/extensions/api/usb/usb_api.cc +++ b/chrome/browser/extensions/api/usb/usb_api.cc @@ -10,12 +10,12 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop_proxy.h" #include "chrome/browser/extensions/api/usb/usb_device_resource.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/usb/usb_device_handle.h" #include "chrome/browser/usb/usb_service.h" #include "chrome/common/extensions/api/usb.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/permissions/permissions_data.h" namespace usb = extensions::api::usb; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 2feb529..94628ab 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/retargeting_details.h" @@ -27,6 +26,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc index 77f1a44..fdbb0a7 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc @@ -11,7 +11,6 @@ #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/web_navigation.h" @@ -20,6 +19,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/event_filtering_info.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 191e2ef..39827ff 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" @@ -37,6 +36,7 @@ #include "content/public/common/context_menu_params.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 7061e9f..cb7a821 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -31,7 +31,6 @@ #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h" #include "chrome/browser/extensions/extension_renderer_state.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_warning_service.h" #include "chrome/browser/extensions/extension_warning_set.h" #include "chrome/browser/profiles/profile.h" @@ -49,6 +48,7 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/browser/runtime_data.h" #include "extensions/common/error_utils.h" @@ -403,7 +403,7 @@ namespace extensions { WebRequestAPI::WebRequestAPI(content::BrowserContext* context) : browser_context_(context) { EventRouter* event_router = - ExtensionSystem::GetForBrowserContext(browser_context_)->event_router(); + ExtensionSystem::Get(browser_context_)->event_router(); for (size_t i = 0; i < arraysize(kWebRequestEvents); ++i) { // Observe the webRequest event. std::string event_name = kWebRequestEvents[i]; @@ -416,7 +416,7 @@ WebRequestAPI::WebRequestAPI(content::BrowserContext* context) } WebRequestAPI::~WebRequestAPI() { - ExtensionSystem::GetForBrowserContext(browser_context_) + ExtensionSystem::Get(browser_context_) ->event_router() ->UnregisterObserver(this); } diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index a7483e0..206eb7b 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/api/web_request/web_request_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -19,6 +18,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/features/feature.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 82a6340..95dfcd6 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -19,7 +19,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/gpu/gpu_feature_checker.h" @@ -39,6 +38,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/common/error_utils.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/app_icon_loader_impl.cc b/chrome/browser/extensions/app_icon_loader_impl.cc index bde988b..62aad03 100644 --- a/chrome/browser/extensions/app_icon_loader_impl.cc +++ b/chrome/browser/extensions/app_icon_loader_impl.cc @@ -6,11 +6,11 @@ #include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" +#include "extensions/browser/extension_system.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/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 6d5df51..a7a3029 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" #include "chrome/browser/ui/browser.h" @@ -28,6 +27,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_map.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 181f409..930162d 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "extensions/browser/extension_system.h" // Tests that tooltips of a browser action icon can be specified using UTF8. // See http://crbug.com/25349. diff --git a/chrome/browser/extensions/browsertest_util.cc b/chrome/browser/extensions/browsertest_util.cc index b65be05..4c5bc8c 100644 --- a/chrome/browser/extensions/browsertest_util.cc +++ b/chrome/browser/extensions/browsertest_util.cc @@ -5,8 +5,9 @@ #include "chrome/browser/extensions/browsertest_util.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc index 6928e29..e132a02 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc @@ -9,7 +9,6 @@ #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_app_sorting.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -18,8 +17,10 @@ #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" +#include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/pref_names.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" #if defined(OS_CHROMEOS) @@ -28,7 +29,11 @@ namespace extensions { -ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {} +ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { + // Only set if it hasn't already been set (e.g. by a test). + if (GetCurrentChannel() == GetDefaultChannel()) + SetCurrentChannel(chrome::VersionInfo::GetChannel()); +} ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {} diff --git a/chrome/browser/extensions/chrome_notification_observer.cc b/chrome/browser/extensions/chrome_notification_observer.cc index af7f796..0289715 100644 --- a/chrome/browser/extensions/chrome_notification_observer.cc +++ b/chrome/browser/extensions/chrome_notification_observer.cc @@ -6,10 +6,10 @@ #include "base/logging.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" namespace extensions { diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc index a49a1d97..396352a 100644 --- a/chrome/browser/extensions/context_menu_matcher.cc +++ b/chrome/browser/extensions/context_menu_matcher.cc @@ -6,10 +6,10 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "content/public/common/context_menu_params.h" +#include "extensions/browser/extension_system.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index e3ba248..dbaba4e 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -28,7 +28,6 @@ #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/profiles/profile.h" @@ -42,6 +41,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/kiosk_mode_info.h" diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index d4e0df3..acf5f14 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -21,6 +20,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/download_test_observer.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/extensions/devtools_util.cc b/chrome/browser/extensions/devtools_util.cc index 21e5fe8..028b6a0 100644 --- a/chrome/browser/extensions/devtools_util.cc +++ b/chrome/browser/extensions/devtools_util.cc @@ -6,8 +6,8 @@ #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc index 44dc307..9fc5089 100644 --- a/chrome/browser/extensions/error_console/error_console.cc +++ b/chrome/browser/extensions/error_console/error_console.cc @@ -15,12 +15,12 @@ #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.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc index bf39190..92ff086 100644 --- a/chrome/browser/extensions/event_router_forwarder.cc +++ b/chrome/browser/extensions/event_router_forwarder.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc index 3804c46..d44607f 100644 --- a/chrome/browser/extensions/extension_action_manager.cc +++ b/chrome/browser/extensions/extension_action_manager.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/extension_action/action_info.h" @@ -18,6 +17,7 @@ #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index a317bac..003e7f8 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/test/test_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -18,6 +17,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "net/base/escape.h" diff --git a/chrome/browser/extensions/extension_bindings_apitest.cc b/chrome/browser/extensions/extension_bindings_apitest.cc index fb5c114..38512e9 100644 --- a/chrome/browser/extensions/extension_bindings_apitest.cc +++ b/chrome/browser/extensions/extension_bindings_apitest.cc @@ -7,11 +7,11 @@ #include "chrome/browser/extensions/api/permissions/permissions_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 6f80211..ca731b3 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_cache_fake.h" @@ -42,6 +41,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/extension_set.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index a64a083..0588a21 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -12,12 +12,13 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_notification_observer.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 2585602..29a5bed 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -6,7 +6,6 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/profiles/profile.h" @@ -15,6 +14,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/context_menu_params.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/test_management_policy.h" #include "extensions/common/extension_set.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index c2addc1..0fde704 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -21,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc index c56cb3a..a5d6a81 100644 --- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc +++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc @@ -5,11 +5,11 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_service_unittest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/test_management_policy.h" #include "extensions/common/extension_builder.h" #include "extensions/common/value_builder.h" diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 0b9c0bd..c91a4fc 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -6,7 +6,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/balloon_host.h" @@ -23,6 +22,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" #include "ui/message_center/message_center.h" diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 17da794..3ddafe6 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -17,7 +17,6 @@ #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" @@ -32,6 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/result_codes.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_map.h" #include "extensions/browser/quota_service.h" #include "extensions/common/extension_api.h" @@ -331,8 +331,7 @@ void ExtensionFunctionDispatcher::DispatchWithCallbackInternal( DCHECK(render_view_host || render_frame_host); // TODO(yzshen): There is some shared logic between this method and // DispatchOnIOThread(). It is nice to deduplicate. - ExtensionSystem* extension_system = - ExtensionSystem::GetForBrowserContext(browser_context_); + ExtensionSystem* extension_system = ExtensionSystem::Get(browser_context_); ExtensionService* service = extension_system->extension_service(); extensions::ProcessMap* process_map = extensions::ProcessMap::Get(browser_context_); @@ -408,7 +407,7 @@ void ExtensionFunctionDispatcher::DispatchWithCallbackInternal( void ExtensionFunctionDispatcher::OnExtensionFunctionCompleted( const Extension* extension) { - ExtensionSystem::GetForBrowserContext(browser_context_)->process_manager()-> + ExtensionSystem::Get(browser_context_)->process_manager()-> DecrementLazyKeepaliveCount(extension); } diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index c731e18..0b74d7f 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -17,7 +17,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/error_console/error_console.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" @@ -39,6 +38,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_error.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/runtime_data.h" @@ -203,8 +203,7 @@ void ExtensionHost::CreateRenderViewNow() { } ExtensionService* ExtensionHost::GetExtensionService() { - return ExtensionSystem::GetForBrowserContext(browser_context_) - ->extension_service(); + return ExtensionSystem::Get(browser_context_)->extension_service(); } const GURL& ExtensionHost::GetURL() const { @@ -324,7 +323,7 @@ void ExtensionHost::DocumentAvailableInMainFrame() { void ExtensionHost::OnDocumentAvailable() { DCHECK(extension_host_type_ == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); - ExtensionSystem::GetForBrowserContext(browser_context_) + ExtensionSystem::Get(browser_context_) ->runtime_data() ->SetBackgroundPageReady(extension_, true); content::NotificationService::current()->Notify( @@ -358,21 +357,20 @@ void ExtensionHost::OnRequest(const ExtensionHostMsg_Request_Params& params) { } void ExtensionHost::OnEventAck() { - EventRouter* router = - ExtensionSystem::GetForBrowserContext(browser_context_)->event_router(); + EventRouter* router = ExtensionSystem::Get(browser_context_)->event_router(); if (router) router->OnEventAck(browser_context_, extension_id()); } void ExtensionHost::OnIncrementLazyKeepaliveCount() { - ProcessManager* pm = ExtensionSystem::GetForBrowserContext( + ProcessManager* pm = ExtensionSystem::Get( browser_context_)->process_manager(); if (pm) pm->IncrementLazyKeepaliveCount(extension()); } void ExtensionHost::OnDecrementLazyKeepaliveCount() { - ProcessManager* pm = ExtensionSystem::GetForBrowserContext( + ProcessManager* pm = ExtensionSystem::Get( browser_context_)->process_manager(); if (pm) pm->DecrementLazyKeepaliveCount(extension()); @@ -394,7 +392,7 @@ void ExtensionHost::OnDetailedConsoleMessageAdded( context_url = host_contents_->GetLastCommittedURL(); ErrorConsole* console = - ExtensionSystem::GetForBrowserContext(browser_context_)->error_console(); + ExtensionSystem::Get(browser_context_)->error_console(); if (!console) return; diff --git a/chrome/browser/extensions/extension_installer.cc b/chrome/browser/extensions/extension_installer.cc index 5ba8620..c43421d 100644 --- a/chrome/browser/extensions/extension_installer.cc +++ b/chrome/browser/extensions/extension_installer.cc @@ -5,9 +5,9 @@ #include "chrome/browser/extensions/extension_installer.h" #include "base/bind.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc index f0476ec..b383376 100644 --- a/chrome/browser/extensions/extension_keybinding_registry.cc +++ b/chrome/browser/extensions/extension_keybinding_registry.cc @@ -9,9 +9,9 @@ #include "chrome/browser/extensions/active_tab_permission_granter.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index e54bd12..593a73f 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -29,6 +28,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "net/cert/asn1_util.h" #include "net/cert/jwk_serializer.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 2f4652b..4cdcf8d 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -22,6 +21,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/webplugininfo.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "net/dns/mock_host_resolver.h" using content::PluginService; diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index d404fbf9..f7f1140 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -40,7 +40,6 @@ #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/external_install_ui.h" #include "chrome/browser/extensions/external_provider_impl.h" @@ -77,6 +76,7 @@ #include "extensions/browser/app_sorting.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/external_provider_interface.h" #include "extensions/browser/management_policy.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 49edb1e..d2684f1 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -44,7 +44,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/browser/extensions/extension_sync_data.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/external_install_ui.h" #include "chrome/browser/extensions/external_policy_loader.h" @@ -89,6 +88,7 @@ #include "content/public/common/content_constants.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/external_provider_interface.h" #include "extensions/browser/management_policy.h" #include "extensions/browser/pending_extension_info.h" diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 176962e..b2cf894 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -11,7 +11,6 @@ #include "base/strings/string_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/extensions/extension_sync_service_factory.cc b/chrome/browser/extensions/extension_sync_service_factory.cc index 2d3aee9..1e8629c 100644 --- a/chrome/browser/extensions/extension_sync_service_factory.cc +++ b/chrome/browser/extensions/extension_sync_service_factory.cc @@ -6,12 +6,12 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/browser/extensions/extension_system.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_prefs_factory.h" +#include "extensions/browser/extension_system.h" // static ExtensionSyncService* ExtensionSyncServiceFactory::GetForProfile( @@ -42,8 +42,7 @@ BrowserContextKeyedService* return new ExtensionSyncService( profile, extensions::ExtensionPrefsFactory::GetForBrowserContext(context), - extensions::ExtensionSystemFactory::GetForProfile(profile)-> - extension_service()); + extensions::ExtensionSystem::Get(profile)->extension_service()); } content::BrowserContext* ExtensionSyncServiceFactory::GetBrowserContextToUse( diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc deleted file mode 100644 index f5966bc..0000000 --- a/chrome/browser/extensions/extension_system.cc +++ /dev/null @@ -1,460 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/extensions/extension_system.h" - -#include "base/base_switches.h" -#include "base/bind.h" -#include "base/command_line.h" -#include "base/files/file_path.h" -#include "base/strings/string_tokenizer.h" -#include "chrome/browser/browser_process.h" -#include "chrome/browser/content_settings/cookie_settings.h" -#include "chrome/browser/extensions/blacklist.h" -#include "chrome/browser/extensions/component_loader.h" -#include "chrome/browser/extensions/error_console/error_console.h" -#include "chrome/browser/extensions/extension_error_reporter.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/extension_warning_badge_service.h" -#include "chrome/browser/extensions/extension_warning_set.h" -#include "chrome/browser/extensions/install_verifier.h" -#include "chrome/browser/extensions/navigation_observer.h" -#include "chrome/browser/extensions/standard_management_policy_provider.h" -#include "chrome/browser/extensions/state_store.h" -#include "chrome/browser/extensions/unpacked_installer.h" -#include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" -#include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/features/feature_channel.h" -#include "content/public/browser/browser_thread.h" -#include "content/public/browser/url_data_source.h" -#include "extensions/browser/event_router.h" -#include "extensions/browser/extension_pref_store.h" -#include "extensions/browser/extension_pref_value_map.h" -#include "extensions/browser/extension_pref_value_map_factory.h" -#include "extensions/browser/extension_prefs.h" -#include "extensions/browser/extension_registry.h" -#include "extensions/browser/info_map.h" -#include "extensions/browser/lazy_background_task_queue.h" -#include "extensions/browser/management_policy.h" -#include "extensions/browser/process_manager.h" -#include "extensions/browser/runtime_data.h" -#include "extensions/common/constants.h" -#include "extensions/common/extension.h" -#include "extensions/common/manifest.h" - -#if defined(ENABLE_NOTIFICATIONS) -#include "chrome/browser/notifications/desktop_notification_service.h" -#include "chrome/browser/notifications/desktop_notification_service_factory.h" -#include "ui/message_center/notifier_settings.h" -#endif - -#if defined(OS_CHROMEOS) -#include "chrome/browser/app_mode/app_mode_utils.h" -#include "chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h" -#include "chrome/browser/chromeos/login/user.h" -#include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/chromeos/policy/device_local_account.h" -#include "chromeos/chromeos_switches.h" -#include "chromeos/login/login_state.h" -#endif - -using content::BrowserThread; - -namespace extensions { - -// -// ExtensionSystem -// - -ExtensionSystem::ExtensionSystem() { - // Only set if it hasn't already been set (e.g. by a test). - if (GetCurrentChannel() == GetDefaultChannel()) - SetCurrentChannel(chrome::VersionInfo::GetChannel()); -} - -ExtensionSystem::~ExtensionSystem() { -} - -// static -ExtensionSystem* ExtensionSystem::Get(Profile* profile) { - return ExtensionSystemFactory::GetForProfile(profile); -} - -// static -ExtensionSystem* ExtensionSystem::GetForBrowserContext( - content::BrowserContext* profile) { - return ExtensionSystemFactory::GetForProfile(static_cast(profile)); -} - -// -// ExtensionSystemImpl::Shared -// - -ExtensionSystemImpl::Shared::Shared(Profile* profile) - : profile_(profile) { -} - -ExtensionSystemImpl::Shared::~Shared() { -} - -void ExtensionSystemImpl::Shared::InitPrefs() { - lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_)); - event_router_.reset(new EventRouter(profile_, ExtensionPrefs::Get(profile_))); -// TODO(yoz): Remove once crbug.com/159265 is fixed. -#if defined(ENABLE_EXTENSIONS) - // Two state stores. The latter, which contains declarative rules, must be - // loaded immediately so that the rules are ready before we issue network - // requests. - state_store_.reset(new StateStore( - profile_, - profile_->GetPath().AppendASCII(extensions::kStateStoreName), - true)); - - rules_store_.reset(new StateStore( - profile_, - profile_->GetPath().AppendASCII(extensions::kRulesStoreName), - false)); - - blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_))); - - standard_management_policy_provider_.reset( - new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_))); - -#if defined (OS_CHROMEOS) - const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser(); - policy::DeviceLocalAccount::Type device_local_account_type; - if (user && policy::IsDeviceLocalAccountUser(user->email(), - &device_local_account_type)) { - device_local_account_management_policy_provider_.reset( - new chromeos::DeviceLocalAccountManagementPolicyProvider( - device_local_account_type)); - } -#endif // defined (OS_CHROMEOS) - -#endif // defined(ENABLE_EXTENSIONS) -} - -void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() { -// TODO(yoz): Remove once crbug.com/159265 is fixed. -#if defined(ENABLE_EXTENSIONS) - DCHECK(standard_management_policy_provider_.get()); - management_policy_->RegisterProvider( - standard_management_policy_provider_.get()); - -#if defined (OS_CHROMEOS) - if (device_local_account_management_policy_provider_) { - management_policy_->RegisterProvider( - device_local_account_management_policy_provider_.get()); - } -#endif // defined (OS_CHROMEOS) - - management_policy_->RegisterProvider(install_verifier_.get()); - -#endif // defined(ENABLE_EXTENSIONS) -} - -void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { - const CommandLine* command_line = CommandLine::ForCurrentProcess(); - - navigation_observer_.reset(new NavigationObserver(profile_)); - - bool allow_noisy_errors = !command_line->HasSwitch(switches::kNoErrorDialogs); - ExtensionErrorReporter::Init(allow_noisy_errors); - - user_script_master_ = new UserScriptMaster(profile_); - - // ExtensionService depends on RuntimeData. - runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_))); - - bool autoupdate_enabled = true; -#if defined(OS_CHROMEOS) - if (!extensions_enabled) - autoupdate_enabled = false; - else - autoupdate_enabled = - !command_line->HasSwitch(chromeos::switches::kGuestSession); -#endif - extension_service_.reset(new ExtensionService( - profile_, - CommandLine::ForCurrentProcess(), - profile_->GetPath().AppendASCII(extensions::kInstallDirectoryName), - ExtensionPrefs::Get(profile_), - blacklist_.get(), - autoupdate_enabled, - extensions_enabled, - &ready_)); - - // These services must be registered before the ExtensionService tries to - // load any extensions. - { - install_verifier_.reset(new InstallVerifier(ExtensionPrefs::Get(profile_), - profile_->GetRequestContext())); - install_verifier_->Init(); - - management_policy_.reset(new ManagementPolicy); - RegisterManagementPolicyProviders(); - } - - bool skip_session_extensions = false; -#if defined(OS_CHROMEOS) - // Skip loading session extensions if we are not in a user session. - skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn(); - if (chrome::IsRunningInForcedAppMode()) { - extension_service_->component_loader()-> - AddDefaultComponentExtensionsForKioskMode(skip_session_extensions); - } else { - extension_service_->component_loader()->AddDefaultComponentExtensions( - skip_session_extensions); - } -#else - extension_service_->component_loader()->AddDefaultComponentExtensions( - skip_session_extensions); -#endif - if (command_line->HasSwitch(switches::kLoadComponentExtension)) { - CommandLine::StringType path_list = command_line->GetSwitchValueNative( - switches::kLoadComponentExtension); - base::StringTokenizerT t(path_list, - FILE_PATH_LITERAL(",")); - while (t.GetNext()) { - // Load the component extension manifest synchronously. - // Blocking the UI thread is acceptable here since - // this flag designated for developers. - base::ThreadRestrictions::ScopedAllowIO allow_io; - extension_service_->component_loader()->AddOrReplace( - base::FilePath(t.token())); - } - } - extension_service_->Init(); - - // Make the chrome://extension-icon/ resource available. - content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_)); - - extension_warning_service_.reset(new ExtensionWarningService(profile_)); - extension_warning_badge_service_.reset( - new ExtensionWarningBadgeService(profile_)); - extension_warning_service_->AddObserver( - extension_warning_badge_service_.get()); - error_console_.reset(new ErrorConsole(profile_, extension_service_.get())); - - if (extensions_enabled) { - // Load any extensions specified with --load-extension. - // TODO(yoz): Seems like this should move into ExtensionService::Init. - // But maybe it's no longer important. - if (command_line->HasSwitch(switches::kLoadExtension)) { - CommandLine::StringType path_list = command_line->GetSwitchValueNative( - switches::kLoadExtension); - base::StringTokenizerT t(path_list, - FILE_PATH_LITERAL(",")); - while (t.GetNext()) { - std::string extension_id; - UnpackedInstaller::Create(extension_service_.get())-> - LoadFromCommandLine(base::FilePath(t.token()), &extension_id); - } - } - } -} - -void ExtensionSystemImpl::Shared::Shutdown() { - if (extension_warning_service_) { - extension_warning_service_->RemoveObserver( - extension_warning_badge_service_.get()); - } - if (extension_service_) - extension_service_->Shutdown(); -} - -StateStore* ExtensionSystemImpl::Shared::state_store() { - return state_store_.get(); -} - -StateStore* ExtensionSystemImpl::Shared::rules_store() { - return rules_store_.get(); -} - -ExtensionService* ExtensionSystemImpl::Shared::extension_service() { - return extension_service_.get(); -} - -RuntimeData* ExtensionSystemImpl::Shared::runtime_data() { - return runtime_data_.get(); -} - -ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() { - return management_policy_.get(); -} - -UserScriptMaster* ExtensionSystemImpl::Shared::user_script_master() { - return user_script_master_.get(); -} - -InfoMap* ExtensionSystemImpl::Shared::info_map() { - if (!extension_info_map_.get()) - extension_info_map_ = new InfoMap(); - return extension_info_map_.get(); -} - -LazyBackgroundTaskQueue* - ExtensionSystemImpl::Shared::lazy_background_task_queue() { - return lazy_background_task_queue_.get(); -} - -EventRouter* ExtensionSystemImpl::Shared::event_router() { - return event_router_.get(); -} - -ExtensionWarningService* ExtensionSystemImpl::Shared::warning_service() { - return extension_warning_service_.get(); -} - -Blacklist* ExtensionSystemImpl::Shared::blacklist() { - return blacklist_.get(); -} - -ErrorConsole* ExtensionSystemImpl::Shared::error_console() { - return error_console_.get(); -} - -InstallVerifier* ExtensionSystemImpl::Shared::install_verifier() { - return install_verifier_.get(); -} - -// -// ExtensionSystemImpl -// - -ExtensionSystemImpl::ExtensionSystemImpl(Profile* profile) - : profile_(profile) { - shared_ = ExtensionSystemSharedFactory::GetForProfile(profile); - - if (profile->IsOffTheRecord()) { - process_manager_.reset(ProcessManager::Create(profile)); - } else { - shared_->InitPrefs(); - } -} - -ExtensionSystemImpl::~ExtensionSystemImpl() { -} - -void ExtensionSystemImpl::Shutdown() { - process_manager_.reset(); -} - -void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) { - DCHECK(!profile_->IsOffTheRecord()); - if (user_script_master() || extension_service()) - return; // Already initialized. - - // The InfoMap needs to be created before the ProcessManager. - shared_->info_map(); - - process_manager_.reset(ProcessManager::Create(profile_)); - - shared_->Init(extensions_enabled); -} - -ExtensionService* ExtensionSystemImpl::extension_service() { - return shared_->extension_service(); -} - -RuntimeData* ExtensionSystemImpl::runtime_data() { - return shared_->runtime_data(); -} - -ManagementPolicy* ExtensionSystemImpl::management_policy() { - return shared_->management_policy(); -} - -UserScriptMaster* ExtensionSystemImpl::user_script_master() { - return shared_->user_script_master(); -} - -ProcessManager* ExtensionSystemImpl::process_manager() { - return process_manager_.get(); -} - -StateStore* ExtensionSystemImpl::state_store() { - return shared_->state_store(); -} - -StateStore* ExtensionSystemImpl::rules_store() { - return shared_->rules_store(); -} - -InfoMap* ExtensionSystemImpl::info_map() { return shared_->info_map(); } - -LazyBackgroundTaskQueue* ExtensionSystemImpl::lazy_background_task_queue() { - return shared_->lazy_background_task_queue(); -} - -EventRouter* ExtensionSystemImpl::event_router() { - return shared_->event_router(); -} - -ExtensionWarningService* ExtensionSystemImpl::warning_service() { - return shared_->warning_service(); -} - -Blacklist* ExtensionSystemImpl::blacklist() { - return shared_->blacklist(); -} - -const OneShotEvent& ExtensionSystemImpl::ready() const { - return shared_->ready(); -} - -ErrorConsole* ExtensionSystemImpl::error_console() { - return shared_->error_console(); -} - -InstallVerifier* ExtensionSystemImpl::install_verifier() { - return shared_->install_verifier(); -} - -void ExtensionSystemImpl::RegisterExtensionWithRequestContexts( - const Extension* extension) { - base::Time install_time; - if (extension->location() != Manifest::COMPONENT) { - install_time = ExtensionPrefs::Get(profile_)-> - GetInstallTime(extension->id()); - } - bool incognito_enabled = util::IsIncognitoEnabled(extension->id(), profile_); - - bool notifications_disabled = false; -#if defined(ENABLE_NOTIFICATIONS) - message_center::NotifierId notifier_id( - message_center::NotifierId::APPLICATION, - extension->id()); - - DesktopNotificationService* notification_service = - DesktopNotificationServiceFactory::GetForProfile(profile_); - notifications_disabled = - !notification_service->IsNotifierEnabled(notifier_id); -#endif - - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::Bind(&InfoMap::AddExtension, info_map(), - make_scoped_refptr(extension), install_time, - incognito_enabled, notifications_disabled)); -} - -void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( - const std::string& extension_id, - const UnloadedExtensionInfo::Reason reason) { - BrowserThread::PostTask( - BrowserThread::IO, - FROM_HERE, - base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason)); -} - -} // namespace extensions diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h deleted file mode 100644 index 2f83dcc..0000000 --- a/chrome/browser/extensions/extension_system.h +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_ - -#include - -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" -#include "extensions/common/extension.h" -#include "extensions/common/one_shot_event.h" - -class ExtensionService; -class Profile; - -#if defined(OS_CHROMEOS) -namespace chromeos { -class DeviceLocalAccountManagementPolicyProvider; -} -#endif // defined(OS_CHROMEOS) - -namespace content { -class BrowserContext; -} - -namespace extensions { -class Blacklist; -class ErrorConsole; -class EventRouter; -class Extension; -class ExtensionSystemSharedFactory; -class ExtensionWarningBadgeService; -class ExtensionWarningService; -class InfoMap; -class InstallVerifier; -class LazyBackgroundTaskQueue; -class ManagementPolicy; -class NavigationObserver; -class ProcessManager; -class RuntimeData; -class StandardManagementPolicyProvider; -class StateStore; -class UserScriptMaster; - -// The ExtensionSystem manages the creation and destruction of services -// related to extensions. Most objects are shared between normal -// and incognito Profiles, except as called out in comments. -// This interface supports using TestExtensionSystem for TestingProfiles -// that don't want all of the extensions baggage in their tests. -class ExtensionSystem : public BrowserContextKeyedService { - public: - ExtensionSystem(); - virtual ~ExtensionSystem(); - - // Returns the instance for the given profile, or NULL if none. This is - // a convenience wrapper around ExtensionSystemFactory::GetForProfile. - static ExtensionSystem* Get(Profile* profile); - - // Returns the same instance as Get() above. - static ExtensionSystem* GetForBrowserContext( - content::BrowserContext* profile); - - // BrowserContextKeyedService implementation. - virtual void Shutdown() OVERRIDE {} - - // Initializes extensions machinery. - // Component extensions are always enabled, external and user extensions are - // controlled by |extensions_enabled|. - virtual void InitForRegularProfile(bool extensions_enabled) = 0; - - // The ExtensionService is created at startup. - virtual ExtensionService* extension_service() = 0; - - // Per-extension data that can change during the life of the process but - // does not persist across restarts. Lives on UI thread. Created at startup. - virtual RuntimeData* runtime_data() = 0; - - // The class controlling whether users are permitted to perform certain - // actions on extensions (install, uninstall, disable, etc.). - // The ManagementPolicy is created at startup. - virtual ManagementPolicy* management_policy() = 0; - - // The UserScriptMaster is created at startup. - virtual UserScriptMaster* user_script_master() = 0; - - // The ProcessManager is created at startup. - virtual ProcessManager* process_manager() = 0; - - // The StateStore is created at startup. - virtual StateStore* state_store() = 0; - - // The rules store is created at startup. - virtual StateStore* rules_store() = 0; - - // Returns the IO-thread-accessible extension data. - virtual InfoMap* info_map() = 0; - - // The LazyBackgroundTaskQueue is created at startup. - virtual LazyBackgroundTaskQueue* lazy_background_task_queue() = 0; - - // The EventRouter is created at startup. - virtual EventRouter* event_router() = 0; - - // The ExtensionWarningService is created at startup. - virtual ExtensionWarningService* warning_service() = 0; - - // The blacklist is created at startup. - virtual Blacklist* blacklist() = 0; - - // The ErrorConsole is created at startup. - virtual ErrorConsole* error_console() = 0; - - // The InstallVerifier is created at startup. - virtual InstallVerifier* install_verifier() = 0; - - // Called by the ExtensionService that lives in this system. Gives the - // info map a chance to react to the load event before the EXTENSION_LOADED - // notification has fired. The purpose for handling this event first is to - // avoid race conditions by making sure URLRequestContexts learn about new - // extensions before anything else needs them to know. - virtual void RegisterExtensionWithRequestContexts( - const Extension* extension) {} - - // Called by the ExtensionService that lives in this system. Lets the - // info map clean up its RequestContexts once all the listeners to the - // EXTENSION_UNLOADED notification have finished running. - virtual void UnregisterExtensionWithRequestContexts( - const std::string& extension_id, - const UnloadedExtensionInfo::Reason reason) {} - - // Signaled when the extension system has completed its startup tasks. - virtual const OneShotEvent& ready() const = 0; -}; - -// The ExtensionSystem for ProfileImpl and OffTheRecordProfileImpl. -// Implementation details: non-shared services are owned by -// ExtensionSystemImpl, a BrowserContextKeyedService with separate incognito -// instances. A private Shared class (also a BrowserContextKeyedService, -// but with a shared instance for incognito) keeps the common services. -class ExtensionSystemImpl : public ExtensionSystem { - public: - explicit ExtensionSystemImpl(Profile* profile); - virtual ~ExtensionSystemImpl(); - - // BrowserContextKeyedService implementation. - virtual void Shutdown() OVERRIDE; - - virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE; - - virtual ExtensionService* extension_service() OVERRIDE; // shared - virtual RuntimeData* runtime_data() OVERRIDE; // shared - virtual ManagementPolicy* management_policy() OVERRIDE; // shared - virtual UserScriptMaster* user_script_master() OVERRIDE; // shared - virtual ProcessManager* process_manager() OVERRIDE; - virtual StateStore* state_store() OVERRIDE; // shared - virtual StateStore* rules_store() OVERRIDE; // shared - virtual LazyBackgroundTaskQueue* lazy_background_task_queue() - OVERRIDE; // shared - virtual InfoMap* info_map() OVERRIDE; // shared - virtual EventRouter* event_router() OVERRIDE; // shared - virtual ExtensionWarningService* warning_service() OVERRIDE; - virtual Blacklist* blacklist() OVERRIDE; // shared - virtual ErrorConsole* error_console() OVERRIDE; - virtual InstallVerifier* install_verifier() OVERRIDE; - - virtual void RegisterExtensionWithRequestContexts( - const Extension* extension) OVERRIDE; - - virtual void UnregisterExtensionWithRequestContexts( - const std::string& extension_id, - const UnloadedExtensionInfo::Reason reason) OVERRIDE; - - virtual const OneShotEvent& ready() const OVERRIDE; - - private: - friend class ExtensionSystemSharedFactory; - - // Owns the Extension-related systems that have a single instance - // shared between normal and incognito profiles. - class Shared : public BrowserContextKeyedService { - public: - explicit Shared(Profile* profile); - virtual ~Shared(); - - // Initialization takes place in phases. - virtual void InitPrefs(); - // This must not be called until all the providers have been created. - void RegisterManagementPolicyProviders(); - void Init(bool extensions_enabled); - - // BrowserContextKeyedService implementation. - virtual void Shutdown() OVERRIDE; - - StateStore* state_store(); - StateStore* rules_store(); - ExtensionService* extension_service(); - RuntimeData* runtime_data(); - ManagementPolicy* management_policy(); - UserScriptMaster* user_script_master(); - Blacklist* blacklist(); - InfoMap* info_map(); - LazyBackgroundTaskQueue* lazy_background_task_queue(); - EventRouter* event_router(); - ExtensionWarningService* warning_service(); - ErrorConsole* error_console(); - InstallVerifier* install_verifier(); - const OneShotEvent& ready() const { return ready_; } - - private: - Profile* profile_; - - // The services that are shared between normal and incognito profiles. - - scoped_ptr state_store_; - scoped_ptr rules_store_; - // LazyBackgroundTaskQueue is a dependency of - // MessageService and EventRouter. - scoped_ptr lazy_background_task_queue_; - scoped_ptr event_router_; - scoped_ptr navigation_observer_; - scoped_refptr user_script_master_; - scoped_ptr blacklist_; - // StandardManagementPolicyProvider depends on Blacklist. - scoped_ptr - standard_management_policy_provider_; - scoped_ptr runtime_data_; - // ExtensionService depends on StateStore, Blacklist and RuntimeData. - scoped_ptr extension_service_; - scoped_ptr management_policy_; - // extension_info_map_ needs to outlive process_manager_. - scoped_refptr extension_info_map_; - scoped_ptr extension_warning_service_; - scoped_ptr extension_warning_badge_service_; - scoped_ptr error_console_; - scoped_ptr install_verifier_; - -#if defined(OS_CHROMEOS) - scoped_ptr - device_local_account_management_policy_provider_; -#endif - - OneShotEvent ready_; - }; - - Profile* profile_; - - Shared* shared_; - - // |process_manager_| must be destroyed before the Profile's |io_data_|. While - // |process_manager_| still lives, we handle incoming resource requests from - // extension processes and those require access to the ResourceContext owned - // by |io_data_|. - scoped_ptr process_manager_; - - DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl); -}; - -} // namespace extensions - -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_ diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc index a9f3d2e..b8e851d 100644 --- a/chrome/browser/extensions/extension_system_factory.cc +++ b/chrome/browser/extensions/extension_system_factory.cc @@ -4,13 +4,13 @@ #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_registry_factory.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/renderer_startup_helper.h" @@ -20,9 +20,10 @@ namespace extensions { // static ExtensionSystemImpl::Shared* -ExtensionSystemSharedFactory::GetForProfile(Profile* profile) { +ExtensionSystemSharedFactory::GetForBrowserContext( + content::BrowserContext* context) { return static_cast( - GetInstance()->GetServiceForBrowserContext(profile, true)); + GetInstance()->GetServiceForBrowserContext(context, true)); } // static @@ -47,8 +48,8 @@ ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() { BrowserContextKeyedService* ExtensionSystemSharedFactory::BuildServiceInstanceFor( - content::BrowserContext* profile) const { - return new ExtensionSystemImpl::Shared(static_cast(profile)); + content::BrowserContext* context) const { + return new ExtensionSystemImpl::Shared(static_cast(context)); } content::BrowserContext* ExtensionSystemSharedFactory::GetBrowserContextToUse( @@ -60,9 +61,10 @@ content::BrowserContext* ExtensionSystemSharedFactory::GetBrowserContextToUse( // ExtensionSystemFactory // static -ExtensionSystem* ExtensionSystemFactory::GetForProfile(Profile* profile) { +ExtensionSystem* ExtensionSystemFactory::GetForBrowserContext( + content::BrowserContext* context) { return static_cast( - GetInstance()->GetServiceForBrowserContext(profile, true)); + GetInstance()->GetServiceForBrowserContext(context, true)); } // static diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h index 280db7a..f2f8e7b 100644 --- a/chrome/browser/extensions/extension_system_factory.h +++ b/chrome/browser/extensions/extension_system_factory.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_FACTORY_H_ #include "base/memory/singleton.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/extensions/extension_system_impl.h" #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "extensions/browser/extension_system.h" class BrowserContextKeyedService; -class Profile; namespace extensions { class ExtensionSystem; @@ -19,8 +19,8 @@ class ExtensionSystem; // Should not be used except by ExtensionSystem(Factory). class ExtensionSystemSharedFactory : public BrowserContextKeyedServiceFactory { public: - static ExtensionSystemImpl::Shared* GetForProfile( - Profile* profile); + static ExtensionSystemImpl::Shared* GetForBrowserContext( + content::BrowserContext* context); static ExtensionSystemSharedFactory* GetInstance(); @@ -30,8 +30,9 @@ class ExtensionSystemSharedFactory : public BrowserContextKeyedServiceFactory { ExtensionSystemSharedFactory(); virtual ~ExtensionSystemSharedFactory(); + // BrowserContextKeyedServiceFactory implementation: virtual BrowserContextKeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* context) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; }; @@ -39,8 +40,8 @@ class ExtensionSystemSharedFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory for ExtensionSystem. class ExtensionSystemFactory : public BrowserContextKeyedServiceFactory { public: - // BrowserContextKeyedServiceFactory implementation: - static ExtensionSystem* GetForProfile(Profile* profile); + static ExtensionSystem* GetForBrowserContext( + content::BrowserContext* context); static ExtensionSystemFactory* GetInstance(); @@ -50,8 +51,9 @@ class ExtensionSystemFactory : public BrowserContextKeyedServiceFactory { ExtensionSystemFactory(); virtual ~ExtensionSystemFactory(); + // BrowserContextKeyedServiceFactory implementation: virtual BrowserContextKeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* context) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc new file mode 100644 index 0000000..6150cd2 --- /dev/null +++ b/chrome/browser/extensions/extension_system_impl.cc @@ -0,0 +1,436 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/extensions/extension_system_impl.h" + +#include "base/base_switches.h" +#include "base/bind.h" +#include "base/command_line.h" +#include "base/files/file_path.h" +#include "base/strings/string_tokenizer.h" +#include "chrome/browser/browser_process.h" +#include "chrome/browser/content_settings/cookie_settings.h" +#include "chrome/browser/extensions/blacklist.h" +#include "chrome/browser/extensions/component_loader.h" +#include "chrome/browser/extensions/error_console/error_console.h" +#include "chrome/browser/extensions/extension_error_reporter.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/extension_warning_badge_service.h" +#include "chrome/browser/extensions/extension_warning_set.h" +#include "chrome/browser/extensions/install_verifier.h" +#include "chrome/browser/extensions/navigation_observer.h" +#include "chrome/browser/extensions/standard_management_policy_provider.h" +#include "chrome/browser/extensions/state_store.h" +#include "chrome/browser/extensions/unpacked_installer.h" +#include "chrome/browser/extensions/user_script_master.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" +#include "chrome/common/chrome_switches.h" +#include "chrome/common/chrome_version_info.h" +#include "chrome/common/extensions/features/feature_channel.h" +#include "content/public/browser/browser_thread.h" +#include "content/public/browser/url_data_source.h" +#include "extensions/browser/event_router.h" +#include "extensions/browser/extension_pref_store.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_registry.h" +#include "extensions/browser/info_map.h" +#include "extensions/browser/lazy_background_task_queue.h" +#include "extensions/browser/management_policy.h" +#include "extensions/browser/process_manager.h" +#include "extensions/browser/runtime_data.h" +#include "extensions/common/constants.h" +#include "extensions/common/extension.h" +#include "extensions/common/manifest.h" + +#if defined(ENABLE_NOTIFICATIONS) +#include "chrome/browser/notifications/desktop_notification_service.h" +#include "chrome/browser/notifications/desktop_notification_service_factory.h" +#include "ui/message_center/notifier_settings.h" +#endif + +#if defined(OS_CHROMEOS) +#include "chrome/browser/app_mode/app_mode_utils.h" +#include "chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h" +#include "chrome/browser/chromeos/login/user.h" +#include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/chromeos/policy/device_local_account.h" +#include "chromeos/chromeos_switches.h" +#include "chromeos/login/login_state.h" +#endif + +using content::BrowserThread; + +namespace extensions { + +// +// ExtensionSystemImpl::Shared +// + +ExtensionSystemImpl::Shared::Shared(Profile* profile) + : profile_(profile) { +} + +ExtensionSystemImpl::Shared::~Shared() { +} + +void ExtensionSystemImpl::Shared::InitPrefs() { + lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_)); + event_router_.reset(new EventRouter(profile_, ExtensionPrefs::Get(profile_))); +// TODO(yoz): Remove once crbug.com/159265 is fixed. +#if defined(ENABLE_EXTENSIONS) + // Two state stores. The latter, which contains declarative rules, must be + // loaded immediately so that the rules are ready before we issue network + // requests. + state_store_.reset(new StateStore( + profile_, + profile_->GetPath().AppendASCII(extensions::kStateStoreName), + true)); + + rules_store_.reset(new StateStore( + profile_, + profile_->GetPath().AppendASCII(extensions::kRulesStoreName), + false)); + + blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_))); + + standard_management_policy_provider_.reset( + new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_))); + +#if defined (OS_CHROMEOS) + const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser(); + policy::DeviceLocalAccount::Type device_local_account_type; + if (user && policy::IsDeviceLocalAccountUser(user->email(), + &device_local_account_type)) { + device_local_account_management_policy_provider_.reset( + new chromeos::DeviceLocalAccountManagementPolicyProvider( + device_local_account_type)); + } +#endif // defined (OS_CHROMEOS) + +#endif // defined(ENABLE_EXTENSIONS) +} + +void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() { +// TODO(yoz): Remove once crbug.com/159265 is fixed. +#if defined(ENABLE_EXTENSIONS) + DCHECK(standard_management_policy_provider_.get()); + management_policy_->RegisterProvider( + standard_management_policy_provider_.get()); + +#if defined (OS_CHROMEOS) + if (device_local_account_management_policy_provider_) { + management_policy_->RegisterProvider( + device_local_account_management_policy_provider_.get()); + } +#endif // defined (OS_CHROMEOS) + + management_policy_->RegisterProvider(install_verifier_.get()); + +#endif // defined(ENABLE_EXTENSIONS) +} + +void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { + const CommandLine* command_line = CommandLine::ForCurrentProcess(); + + navigation_observer_.reset(new NavigationObserver(profile_)); + + bool allow_noisy_errors = !command_line->HasSwitch(switches::kNoErrorDialogs); + ExtensionErrorReporter::Init(allow_noisy_errors); + + user_script_master_ = new UserScriptMaster(profile_); + + // ExtensionService depends on RuntimeData. + runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_))); + + bool autoupdate_enabled = true; +#if defined(OS_CHROMEOS) + if (!extensions_enabled) + autoupdate_enabled = false; + else + autoupdate_enabled = + !command_line->HasSwitch(chromeos::switches::kGuestSession); +#endif + extension_service_.reset(new ExtensionService( + profile_, + CommandLine::ForCurrentProcess(), + profile_->GetPath().AppendASCII(extensions::kInstallDirectoryName), + ExtensionPrefs::Get(profile_), + blacklist_.get(), + autoupdate_enabled, + extensions_enabled, + &ready_)); + + // These services must be registered before the ExtensionService tries to + // load any extensions. + { + install_verifier_.reset(new InstallVerifier(ExtensionPrefs::Get(profile_), + profile_->GetRequestContext())); + install_verifier_->Init(); + + management_policy_.reset(new ManagementPolicy); + RegisterManagementPolicyProviders(); + } + + bool skip_session_extensions = false; +#if defined(OS_CHROMEOS) + // Skip loading session extensions if we are not in a user session. + skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn(); + if (chrome::IsRunningInForcedAppMode()) { + extension_service_->component_loader()-> + AddDefaultComponentExtensionsForKioskMode(skip_session_extensions); + } else { + extension_service_->component_loader()->AddDefaultComponentExtensions( + skip_session_extensions); + } +#else + extension_service_->component_loader()->AddDefaultComponentExtensions( + skip_session_extensions); +#endif + if (command_line->HasSwitch(switches::kLoadComponentExtension)) { + CommandLine::StringType path_list = command_line->GetSwitchValueNative( + switches::kLoadComponentExtension); + base::StringTokenizerT t(path_list, + FILE_PATH_LITERAL(",")); + while (t.GetNext()) { + // Load the component extension manifest synchronously. + // Blocking the UI thread is acceptable here since + // this flag designated for developers. + base::ThreadRestrictions::ScopedAllowIO allow_io; + extension_service_->component_loader()->AddOrReplace( + base::FilePath(t.token())); + } + } + extension_service_->Init(); + + // Make the chrome://extension-icon/ resource available. + content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_)); + + extension_warning_service_.reset(new ExtensionWarningService(profile_)); + extension_warning_badge_service_.reset( + new ExtensionWarningBadgeService(profile_)); + extension_warning_service_->AddObserver( + extension_warning_badge_service_.get()); + error_console_.reset(new ErrorConsole(profile_, extension_service_.get())); + + if (extensions_enabled) { + // Load any extensions specified with --load-extension. + // TODO(yoz): Seems like this should move into ExtensionService::Init. + // But maybe it's no longer important. + if (command_line->HasSwitch(switches::kLoadExtension)) { + CommandLine::StringType path_list = command_line->GetSwitchValueNative( + switches::kLoadExtension); + base::StringTokenizerT t(path_list, + FILE_PATH_LITERAL(",")); + while (t.GetNext()) { + std::string extension_id; + UnpackedInstaller::Create(extension_service_.get())-> + LoadFromCommandLine(base::FilePath(t.token()), &extension_id); + } + } + } +} + +void ExtensionSystemImpl::Shared::Shutdown() { + if (extension_warning_service_) { + extension_warning_service_->RemoveObserver( + extension_warning_badge_service_.get()); + } + if (extension_service_) + extension_service_->Shutdown(); +} + +StateStore* ExtensionSystemImpl::Shared::state_store() { + return state_store_.get(); +} + +StateStore* ExtensionSystemImpl::Shared::rules_store() { + return rules_store_.get(); +} + +ExtensionService* ExtensionSystemImpl::Shared::extension_service() { + return extension_service_.get(); +} + +RuntimeData* ExtensionSystemImpl::Shared::runtime_data() { + return runtime_data_.get(); +} + +ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() { + return management_policy_.get(); +} + +UserScriptMaster* ExtensionSystemImpl::Shared::user_script_master() { + return user_script_master_.get(); +} + +InfoMap* ExtensionSystemImpl::Shared::info_map() { + if (!extension_info_map_.get()) + extension_info_map_ = new InfoMap(); + return extension_info_map_.get(); +} + +LazyBackgroundTaskQueue* + ExtensionSystemImpl::Shared::lazy_background_task_queue() { + return lazy_background_task_queue_.get(); +} + +EventRouter* ExtensionSystemImpl::Shared::event_router() { + return event_router_.get(); +} + +ExtensionWarningService* ExtensionSystemImpl::Shared::warning_service() { + return extension_warning_service_.get(); +} + +Blacklist* ExtensionSystemImpl::Shared::blacklist() { + return blacklist_.get(); +} + +ErrorConsole* ExtensionSystemImpl::Shared::error_console() { + return error_console_.get(); +} + +InstallVerifier* ExtensionSystemImpl::Shared::install_verifier() { + return install_verifier_.get(); +} + +// +// ExtensionSystemImpl +// + +ExtensionSystemImpl::ExtensionSystemImpl(Profile* profile) + : profile_(profile) { + shared_ = ExtensionSystemSharedFactory::GetForBrowserContext(profile); + + if (profile->IsOffTheRecord()) { + process_manager_.reset(ProcessManager::Create(profile)); + } else { + shared_->InitPrefs(); + } +} + +ExtensionSystemImpl::~ExtensionSystemImpl() { +} + +void ExtensionSystemImpl::Shutdown() { + process_manager_.reset(); +} + +void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) { + DCHECK(!profile_->IsOffTheRecord()); + if (user_script_master() || extension_service()) + return; // Already initialized. + + // The InfoMap needs to be created before the ProcessManager. + shared_->info_map(); + + process_manager_.reset(ProcessManager::Create(profile_)); + + shared_->Init(extensions_enabled); +} + +ExtensionService* ExtensionSystemImpl::extension_service() { + return shared_->extension_service(); +} + +RuntimeData* ExtensionSystemImpl::runtime_data() { + return shared_->runtime_data(); +} + +ManagementPolicy* ExtensionSystemImpl::management_policy() { + return shared_->management_policy(); +} + +UserScriptMaster* ExtensionSystemImpl::user_script_master() { + return shared_->user_script_master(); +} + +ProcessManager* ExtensionSystemImpl::process_manager() { + return process_manager_.get(); +} + +StateStore* ExtensionSystemImpl::state_store() { + return shared_->state_store(); +} + +StateStore* ExtensionSystemImpl::rules_store() { + return shared_->rules_store(); +} + +InfoMap* ExtensionSystemImpl::info_map() { return shared_->info_map(); } + +LazyBackgroundTaskQueue* ExtensionSystemImpl::lazy_background_task_queue() { + return shared_->lazy_background_task_queue(); +} + +EventRouter* ExtensionSystemImpl::event_router() { + return shared_->event_router(); +} + +ExtensionWarningService* ExtensionSystemImpl::warning_service() { + return shared_->warning_service(); +} + +Blacklist* ExtensionSystemImpl::blacklist() { + return shared_->blacklist(); +} + +const OneShotEvent& ExtensionSystemImpl::ready() const { + return shared_->ready(); +} + +ErrorConsole* ExtensionSystemImpl::error_console() { + return shared_->error_console(); +} + +InstallVerifier* ExtensionSystemImpl::install_verifier() { + return shared_->install_verifier(); +} + +void ExtensionSystemImpl::RegisterExtensionWithRequestContexts( + const Extension* extension) { + base::Time install_time; + if (extension->location() != Manifest::COMPONENT) { + install_time = ExtensionPrefs::Get(profile_)-> + GetInstallTime(extension->id()); + } + bool incognito_enabled = util::IsIncognitoEnabled(extension->id(), profile_); + + bool notifications_disabled = false; +#if defined(ENABLE_NOTIFICATIONS) + message_center::NotifierId notifier_id( + message_center::NotifierId::APPLICATION, + extension->id()); + + DesktopNotificationService* notification_service = + DesktopNotificationServiceFactory::GetForProfile(profile_); + notifications_disabled = + !notification_service->IsNotifierEnabled(notifier_id); +#endif + + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, + base::Bind(&InfoMap::AddExtension, info_map(), + make_scoped_refptr(extension), install_time, + incognito_enabled, notifications_disabled)); +} + +void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( + const std::string& extension_id, + const UnloadedExtensionInfo::Reason reason) { + BrowserThread::PostTask( + BrowserThread::IO, + FROM_HERE, + base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason)); +} + +} // namespace extensions diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h new file mode 100644 index 0000000..f53b8e5 --- /dev/null +++ b/chrome/browser/extensions/extension_system_impl.h @@ -0,0 +1,145 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ +#define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ + +#include "extensions/browser/extension_system.h" +#include "extensions/common/one_shot_event.h" + +class Profile; + +namespace extensions { + +class ExtensionSystemSharedFactory; +class ExtensionWarningBadgeService; +class NavigationObserver; +class StandardManagementPolicyProvider; + +// The ExtensionSystem for ProfileImpl and OffTheRecordProfileImpl. +// Implementation details: non-shared services are owned by +// ExtensionSystemImpl, a BrowserContextKeyedService with separate incognito +// instances. A private Shared class (also a BrowserContextKeyedService, +// but with a shared instance for incognito) keeps the common services. +class ExtensionSystemImpl : public ExtensionSystem { + public: + explicit ExtensionSystemImpl(Profile* profile); + virtual ~ExtensionSystemImpl(); + + // BrowserContextKeyedService implementation. + virtual void Shutdown() OVERRIDE; + + virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE; + + virtual ExtensionService* extension_service() OVERRIDE; // shared + virtual RuntimeData* runtime_data() OVERRIDE; // shared + virtual ManagementPolicy* management_policy() OVERRIDE; // shared + virtual UserScriptMaster* user_script_master() OVERRIDE; // shared + virtual ProcessManager* process_manager() OVERRIDE; + virtual StateStore* state_store() OVERRIDE; // shared + virtual StateStore* rules_store() OVERRIDE; // shared + virtual LazyBackgroundTaskQueue* lazy_background_task_queue() + OVERRIDE; // shared + virtual InfoMap* info_map() OVERRIDE; // shared + virtual EventRouter* event_router() OVERRIDE; // shared + virtual ExtensionWarningService* warning_service() OVERRIDE; + virtual Blacklist* blacklist() OVERRIDE; // shared + virtual ErrorConsole* error_console() OVERRIDE; + virtual InstallVerifier* install_verifier() OVERRIDE; + + virtual void RegisterExtensionWithRequestContexts( + const Extension* extension) OVERRIDE; + + virtual void UnregisterExtensionWithRequestContexts( + const std::string& extension_id, + const UnloadedExtensionInfo::Reason reason) OVERRIDE; + + virtual const OneShotEvent& ready() const OVERRIDE; + + private: + friend class ExtensionSystemSharedFactory; + + // Owns the Extension-related systems that have a single instance + // shared between normal and incognito profiles. + class Shared : public BrowserContextKeyedService { + public: + explicit Shared(Profile* profile); + virtual ~Shared(); + + // Initialization takes place in phases. + virtual void InitPrefs(); + // This must not be called until all the providers have been created. + void RegisterManagementPolicyProviders(); + void Init(bool extensions_enabled); + + // BrowserContextKeyedService implementation. + virtual void Shutdown() OVERRIDE; + + StateStore* state_store(); + StateStore* rules_store(); + ExtensionService* extension_service(); + RuntimeData* runtime_data(); + ManagementPolicy* management_policy(); + UserScriptMaster* user_script_master(); + Blacklist* blacklist(); + InfoMap* info_map(); + LazyBackgroundTaskQueue* lazy_background_task_queue(); + EventRouter* event_router(); + ExtensionWarningService* warning_service(); + ErrorConsole* error_console(); + InstallVerifier* install_verifier(); + const OneShotEvent& ready() const { return ready_; } + + private: + Profile* profile_; + + // The services that are shared between normal and incognito profiles. + + scoped_ptr state_store_; + scoped_ptr rules_store_; + // LazyBackgroundTaskQueue is a dependency of + // MessageService and EventRouter. + scoped_ptr lazy_background_task_queue_; + scoped_ptr event_router_; + scoped_ptr navigation_observer_; + scoped_refptr user_script_master_; + scoped_ptr blacklist_; + // StandardManagementPolicyProvider depends on Blacklist. + scoped_ptr + standard_management_policy_provider_; + scoped_ptr runtime_data_; + // ExtensionService depends on StateStore, Blacklist and RuntimeData. + scoped_ptr extension_service_; + scoped_ptr management_policy_; + // extension_info_map_ needs to outlive process_manager_. + scoped_refptr extension_info_map_; + scoped_ptr extension_warning_service_; + scoped_ptr extension_warning_badge_service_; + scoped_ptr error_console_; + scoped_ptr install_verifier_; + +#if defined(OS_CHROMEOS) + scoped_ptr + device_local_account_management_policy_provider_; +#endif + + OneShotEvent ready_; + }; + + Profile* profile_; + + Shared* shared_; + + // |process_manager_| must be destroyed before the Profile's |io_data_|. While + // |process_manager_| still lives, we handle incoming resource requests from + // extension processes and those require access to the ResourceContext owned + // by |io_data_|. + scoped_ptr process_manager_; + + DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl); +}; + +} // namespace extensions + +#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ diff --git a/chrome/browser/extensions/extension_test_notification_observer.cc b/chrome/browser/extensions/extension_test_notification_observer.cc index d81b093..c081e640 100644 --- a/chrome/browser/extensions/extension_test_notification_observer.cc +++ b/chrome/browser/extensions/extension_test_notification_observer.cc @@ -6,7 +6,6 @@ #include "base/callback_list.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" @@ -14,6 +13,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc index 3b53e5e..5d5933f 100644 --- a/chrome/browser/extensions/extension_util.cc +++ b/chrome/browser/extensions/extension_util.cc @@ -7,13 +7,13 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/sync_helper.h" #include "content/public/browser/site_instance.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/incognito_info.h" @@ -43,7 +43,7 @@ void SetIsIncognitoEnabled(const std::string& extension_id, content::BrowserContext* context, bool enabled) { ExtensionService* service = - ExtensionSystem::GetForBrowserContext(context)->extension_service(); + ExtensionSystem::Get(context)->extension_service(); CHECK(service); const Extension* extension = service->GetInstalledExtension(extension_id); @@ -121,7 +121,7 @@ void SetAllowFileAccess(const std::string& extension_id, content::BrowserContext* context, bool allow) { ExtensionService* service = - ExtensionSystem::GetForBrowserContext(context)->extension_service(); + ExtensionSystem::Get(context)->extension_service(); CHECK(service); // Reload to update browser state. Only bother if the value changed and the @@ -151,7 +151,7 @@ bool IsAppLaunchableWithoutEnabling(const std::string& extension_id, bool IsExtensionIdle(const std::string& extension_id, content::BrowserContext* context) { ProcessManager* process_manager = - ExtensionSystem::GetForBrowserContext(context)->process_manager(); + ExtensionSystem::Get(context)->process_manager(); DCHECK(process_manager); ExtensionHost* host = process_manager->GetBackgroundHostForExtension(extension_id); diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc index b78d5fa..e0932d2 100644 --- a/chrome/browser/extensions/extension_view_host.cc +++ b/chrome/browser/extensions/extension_view_host.cc @@ -6,7 +6,6 @@ #include "base/strings/string_piece.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/window_controller.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/platform_util.h" @@ -18,6 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/runtime_data.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" @@ -139,7 +139,7 @@ void ExtensionViewHost::OnDocumentAvailable() { } void ExtensionViewHost::LoadInitialURL() { - if (!ExtensionSystem::GetForBrowserContext(browser_context())-> + if (!ExtensionSystem::Get(browser_context())-> runtime_data()->IsBackgroundPageReady(extension())) { // Make sure the background page loads before any others. registrar()->Add(this, @@ -320,7 +320,7 @@ void ExtensionViewHost::Observe(int type, const content::NotificationSource& source, const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY) { - DCHECK(ExtensionSystem::GetForBrowserContext(browser_context())-> + DCHECK(ExtensionSystem::Get(browser_context())-> runtime_data()->IsBackgroundPageReady(extension())); LoadInitialURL(); return; diff --git a/chrome/browser/extensions/extension_view_host_factory.cc b/chrome/browser/extensions/extension_view_host_factory.cc index b791dc0..417495d 100644 --- a/chrome/browser/extensions/extension_view_host_factory.cc +++ b/chrome/browser/extensions/extension_view_host_factory.cc @@ -5,12 +5,12 @@ #include "chrome/browser/extensions/extension_view_host_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/url_constants.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/manifest_handlers/incognito_info.h" #include "extensions/common/view_type.h" diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/extension_warning_badge_service.cc index b420110..557d23e 100644 --- a/chrome/browser/extensions/extension_warning_badge_service.cc +++ b/chrome/browser/extensions/extension_warning_badge_service.cc @@ -6,11 +6,12 @@ #include "base/stl_util.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" -#include "chrome/browser/ui/browser_commands.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_warning_service.cc b/chrome/browser/extensions/extension_warning_service.cc index af2f3b8..a65dfa6 100644 --- a/chrome/browser/extensions/extension_warning_service.cc +++ b/chrome/browser/extensions/extension_warning_service.cc @@ -8,11 +8,11 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_web_contents_observer.cc b/chrome/browser/extensions/extension_web_contents_observer.cc index 5e193af..aed0c23 100644 --- a/chrome/browser/extensions/extension_web_contents_observer.cc +++ b/chrome/browser/extensions/extension_web_contents_observer.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/api/messaging/message_service.h" #include "chrome/browser/extensions/error_console/error_console.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/messaging/message.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" @@ -18,6 +17,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension_urls.h" @@ -155,7 +155,7 @@ const Extension* ExtensionWebContentsObserver::GetExtension( // extensions. It seems to be fast enough, but there is a race. // We should delay loading until the extension has reloaded. if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) { - ExtensionSystem::GetForBrowserContext(browser_context_)-> + ExtensionSystem::Get(browser_context_)-> extension_service()->ReloadExtension(extension_id); } diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index ef346a6..2b7b60c 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -19,7 +19,6 @@ #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/external_component_loader.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/external_pref_loader.h" @@ -28,6 +27,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/external_provider_interface.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/gpu_browsertest.cc b/chrome/browser/extensions/gpu_browsertest.cc index b22722a..1034fb2e 100644 --- a/chrome/browser/extensions/gpu_browsertest.cc +++ b/chrome/browser/extensions/gpu_browsertest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "webkit/common/webpreferences.h" diff --git a/chrome/browser/extensions/gtalk_extension_browsertest.cc b/chrome/browser/extensions/gtalk_extension_browsertest.cc index b2c720f..336a16e 100644 --- a/chrome/browser/extensions/gtalk_extension_browsertest.cc +++ b/chrome/browser/extensions/gtalk_extension_browsertest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -17,6 +16,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" using content::RenderViewHost; diff --git a/chrome/browser/extensions/install_tracker_factory.cc b/chrome/browser/extensions/install_tracker_factory.cc index 5b03b7e..799b3ab 100644 --- a/chrome/browser/extensions/install_tracker_factory.cc +++ b/chrome/browser/extensions/install_tracker_factory.cc @@ -6,12 +6,12 @@ #include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker.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.h" namespace extensions { diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 4a07ac7..b68cfa2 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/api/runtime/runtime_api.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h" @@ -25,6 +24,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/browser/management_policy.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 10943cc..8b27c16 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/profiles/profile.h" @@ -28,6 +27,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index ee997994..4243663 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/menu_manager_factory.h" #include "chrome/browser/extensions/state_store.h" @@ -28,6 +27,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/extensions/menu_manager_factory.cc b/chrome/browser/extensions/menu_manager_factory.cc index 39e013b..1fc4aa1 100644 --- a/chrome/browser/extensions/menu_manager_factory.cc +++ b/chrome/browser/extensions/menu_manager_factory.cc @@ -4,12 +4,12 @@ #include "chrome/browser/extensions/menu_manager_factory.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/menu_manager.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.h" namespace extensions { diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 9d24755..0274886 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -14,7 +14,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/menu_manager.h" #include "chrome/browser/extensions/test_extension_prefs.h" @@ -27,6 +26,7 @@ #include "content/public/common/context_menu_params.h" #include "content/public/test/test_browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc index a4ef5c7..abb0b60 100644 --- a/chrome/browser/extensions/navigation_observer.cc +++ b/chrome/browser/extensions/navigation_observer.cc @@ -6,12 +6,12 @@ #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "extensions/browser/extension_system.h" using content::NavigationController; using content::NavigationEntry; diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index be010f9..4aa9ef0 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc @@ -4,13 +4,13 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index 6da021a..397fdce 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.cc @@ -7,11 +7,11 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc index 8919be1..9ff77bf 100644 --- a/chrome/browser/extensions/page_action_controller.cc +++ b/chrome/browser/extensions/page_action_controller.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" @@ -19,6 +18,7 @@ #include "content/public/browser/navigation_details.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_set.h" namespace extensions { diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index 390b003..266fea9 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/permissions.h" #include "chrome/common/extensions/extension_messages.h" @@ -19,6 +18,7 @@ #include "content/public/browser/render_process_host.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/permissions_data.h" diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 0d86429..520ee7b 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -19,6 +18,7 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "net/base/net_util.h" diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 920de32..b07e35a 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -6,7 +6,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" @@ -17,6 +16,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc index af7c908..68efedf 100644 --- a/chrome/browser/extensions/process_manager_browsertest.cc +++ b/chrome/browser/extensions/process_manager_browsertest.cc @@ -7,10 +7,10 @@ #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" namespace extensions { diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc index 3069565..63d69d6 100644 --- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc +++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc @@ -7,11 +7,11 @@ #include "base/command_line.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "grit/browser_resources.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/suggest_permission_util.cc b/chrome/browser/extensions/suggest_permission_util.cc index f5b68b8..1c47450 100644 --- a/chrome/browser/extensions/suggest_permission_util.cc +++ b/chrome/browser/extensions/suggest_permission_util.cc @@ -4,10 +4,11 @@ #include "chrome/browser/extensions/suggest_permission_util.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/console_message_level.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_info.h" diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index b9d2c06..6ff8642 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/favicon_downloader.h" #include "chrome/browser/extensions/image_loader.h" @@ -57,6 +56,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/frame_navigate_params.h" #include "extensions/browser/extension_error.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/extension_urls.h" diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index d304a89..8ec8ad6 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/error_console/error_console.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/standard_management_policy_provider.h" #include "chrome/browser/extensions/state_store.h" @@ -24,6 +23,7 @@ #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/info_map.h" #include "extensions/browser/management_policy.h" diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h index 2fb69bc..319ca91 100644 --- a/chrome/browser/extensions/test_extension_system.h +++ b/chrome/browser/extensions/test_extension_system.h @@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_ #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_ -#include "chrome/browser/extensions/extension_system.h" +#include "extensions/browser/extension_system.h" +#include "extensions/common/one_shot_event.h" class CommandLine; +class Profile; class TestingValueStore; namespace base { @@ -22,6 +24,7 @@ class BrowserContext; namespace extensions { class ExtensionPrefs; class RuntimeData; +class StandardManagementPolicyProvider; // Test ExtensionSystem, for use with TestingProfile. class TestExtensionSystem : public ExtensionSystem { diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 5d873b1..6296dde 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -27,7 +27,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_sync_data.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" @@ -48,6 +47,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index b3fd8f5..b0c2198 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -18,7 +18,6 @@ #include "base/version.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" @@ -28,6 +27,7 @@ #include "chrome/common/extensions/message_bundle.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc index b1497ee..60b6aab 100644 --- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc @@ -5,17 +5,18 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/extensions/webstore_inline_installer.h" #include "chrome/browser/extensions/webstore_inline_installer_factory.h" #include "chrome/browser/extensions/webstore_installer_test.h" #include "chrome/browser/extensions/webstore_standalone_installer.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index b7d6798..237dadc 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -25,7 +25,6 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/download/download_stats.h" #include "chrome/browser/extensions/crx_installer.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/install_verifier.h" @@ -48,6 +47,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/shared_module_info.h" diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index f79866f..c457b80 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc @@ -9,11 +9,11 @@ #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/webstore_data_fetcher.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index 39b9a1d..ed5ea91 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/startup_helper.h" #include "chrome/browser/extensions/webstore_installer_test.h" #include "chrome/browser/infobars/infobar_service.h" @@ -26,6 +25,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_builder.h" #include "extensions/common/value_builder.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 8046651..39bd653 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -8,7 +8,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -24,6 +23,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc index f92493f4..ebcc786 100644 --- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc @@ -8,13 +8,13 @@ #include "base/sys_info.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/about_sync_util.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/ui/webui/crashes_ui.h" #include "chrome/common/chrome_version_info.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 46ca0c0..c34ee2f 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.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.h" #include "chrome/browser/managed_mode/custodian_profile_downloader_service.h" #include "chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" @@ -38,6 +37,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc index 604f587..2f20bea 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context.cc @@ -14,7 +14,6 @@ #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" @@ -22,6 +21,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index 19c50f3..9b5af22 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc @@ -13,7 +13,6 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h" #include "chrome/browser/media_galleries/imported_media_gallery_registry.h" #include "chrome/browser/media_galleries/media_file_system_context.h" @@ -34,6 +33,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "webkit/browser/fileapi/isolated_context.h" diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc index ac39fd2..ff4a48d8 100644 --- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc +++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc @@ -23,7 +23,6 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/media_galleries/media_file_system_context.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" @@ -44,6 +43,7 @@ #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/web_contents_tester.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc b/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc index f8c2a76..4cfc888 100644 --- a/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc @@ -6,7 +6,6 @@ #include "base/run_loop.h" #include "chrome/browser/extensions/./extension_prefs_unittest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" @@ -14,6 +13,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 5575cc6..219550b 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -18,7 +18,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/fileapi/iapps_finder.h" #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" @@ -31,6 +30,7 @@ #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.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/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index 8a52264..45d8b5b 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -12,7 +12,6 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" @@ -21,6 +20,7 @@ #include "chrome/browser/storage_monitor/test_storage_monitor.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc index 4f48d9c..45d092f 100644 --- a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc @@ -11,7 +11,6 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.h" @@ -20,6 +19,7 @@ #include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc index 582263f..9519b5c 100644 --- a/chrome/browser/media_galleries/media_galleries_test_util.cc +++ b/chrome/browser/media_galleries/media_galleries_test_util.cc @@ -14,11 +14,11 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc index af4344b..194a354 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc @@ -11,7 +11,6 @@ #include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" @@ -26,6 +25,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc index 9e32c6c..dec90e3 100644 --- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc +++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc @@ -10,7 +10,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/nacl_host/nacl_infobar_delegate.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h" @@ -21,6 +20,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/site_instance.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" @@ -69,8 +69,7 @@ void OnKeepaliveOnUIThread( return; extensions::ExtensionSystem* extension_system = - extensions::ExtensionSystem::GetForBrowserContext( - site_instance->GetBrowserContext()); + extensions::ExtensionSystem::Get(site_instance->GetBrowserContext()); if (!extension_system) return; diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 490d11d..747f670 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -25,7 +25,6 @@ #include "chrome/browser/extensions/api/proxy/proxy_api.h" #include "chrome/browser/extensions/api/web_request/web_request_api.h" #include "chrome/browser/extensions/event_router_forwarder.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/net/client_hints.h" #include "chrome/browser/net/connect_interceptor.h" @@ -39,6 +38,7 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_request_info.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 5271dc8..8145225 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -15,7 +15,6 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/api/notifications/notifications_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_service.h" @@ -38,6 +37,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/show_desktop_notification_params.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 3191873..6d500ec 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/notifications/fullscreen_notification_blocker.h" @@ -23,6 +22,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/common/extension_set.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index 995b387..6493613 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/chrome/browser/notifications/message_center_settings_controller.cc @@ -14,7 +14,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/app_icon_loader_impl.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_types.h" @@ -32,6 +31,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "grit/theme_resources.h" #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 2333ed4..de836913 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -37,7 +37,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_cache_fake.h" #include "chrome/browser/extensions/updater/extension_updater.h" @@ -120,6 +119,7 @@ #include "content/public/test/test_utils.h" #include "content/test/net/url_request_failed_job.h" #include "content/test/net/url_request_mock_http_job.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc index df85828..77c5225 100644 --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc @@ -9,7 +9,6 @@ #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" #include "chrome/browser/profiles/profile.h" @@ -23,6 +22,7 @@ #include "chrome/common/pref_names.h" #include "chrome/installer/util/browser_distribution.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #if defined(OS_WIN) diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 3fd940a..aa4f58f 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/api/web_request/web_request_api.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" #include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h" #include "chrome/browser/io_thread.h" @@ -50,6 +49,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "net/http/http_server_properties.h" #include "net/http/transport_security_state.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index c634472..3449c31 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -37,7 +37,6 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" #include "chrome/browser/geolocation/chrome_geolocation_permission_context_factory.h" #include "chrome/browser/history/shortcuts_backend.h" @@ -94,6 +93,7 @@ #include "extensions/browser/extension_pref_store.h" #include "extensions/browser/extension_pref_value_map.h" #include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_system.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 3e8bd58..c508665 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -32,7 +32,6 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/extensions/extension_resource_protocols.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/media/media_device_id_salt.h" #include "chrome/browser/net/about_protocol_handler.h" @@ -55,6 +54,7 @@ #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_context.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" #include "net/base/keygen_handler.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index c4ce8f7..ebfe635 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -62,9 +62,9 @@ #if !defined(OS_IOS) #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/ui/browser_list.h" +#include "extensions/browser/extension_system.h" #endif // !defined (OS_IOS) #if defined(OS_WIN) diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc index 73f6827..d13822c 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc @@ -19,7 +19,6 @@ #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/messaging/message_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/profiles/profile_manager.h" @@ -33,6 +32,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_dispatcher_host.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index ca1555e..35322ee 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -6,7 +6,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" @@ -15,6 +14,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc index 971cf0c..d264408 100644 --- a/chrome/browser/services/gcm/gcm_profile_service.cc +++ b/chrome/browser/services/gcm/gcm_profile_service.cc @@ -10,7 +10,6 @@ #include "base/strings/string_number_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/services/gcm/gcm_client_factory.h" #include "chrome/browser/services/gcm/gcm_event_router.h" @@ -23,6 +22,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc index 9390ea2..f80b6bd 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc @@ -10,7 +10,6 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/speech/extension_api/tts_extension_api.h" #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h" @@ -21,6 +20,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/common/console_message_level.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/speech/extension_api/tts_extension_apitest.cc b/chrome/browser/speech/extension_api/tts_extension_apitest.cc index 2fe5f52..381117c 100644 --- a/chrome/browser/speech/extension_api/tts_extension_apitest.cc +++ b/chrome/browser/speech/extension_api/tts_extension_apitest.cc @@ -9,11 +9,11 @@ #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/speech/extension_api/tts_extension_api.h" #include "chrome/browser/speech/tts_controller.h" #include "chrome/browser/speech/tts_platform.h" #include "chrome/common/chrome_switches.h" +#include "extensions/browser/extension_system.h" #include "net/base/network_change_notifier.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/speech/tts_controller.cc b/chrome/browser/speech/tts_controller.cc index a04adc1..b966885 100644 --- a/chrome/browser/speech/tts_controller.cc +++ b/chrome/browser/speech/tts_controller.cc @@ -9,12 +9,12 @@ #include "base/float_util.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" #include "chrome/browser/speech/extension_api/tts_extension_api.h" #include "chrome/browser/speech/tts_platform.h" #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/sync/glue/extension_data_type_controller.cc b/chrome/browser/sync/glue/extension_data_type_controller.cc index e6c8674..72428fd 100644 --- a/chrome/browser/sync/glue/extension_data_type_controller.cc +++ b/chrome/browser/sync/glue/extension_data_type_controller.cc @@ -5,9 +5,9 @@ #include "chrome/browser/sync/glue/extension_data_type_controller.h" #include "base/metrics/histogram.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_components_factory.h" +#include "extensions/browser/extension_system.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc index 90a1197..8d968cc 100644 --- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc +++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/metrics/histogram.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/generic_change_processor.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "sync/api/syncable_service.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/theme_data_type_controller.cc b/chrome/browser/sync/glue/theme_data_type_controller.cc index 18fea59..5ae9c28 100644 --- a/chrome/browser/sync/glue/theme_data_type_controller.cc +++ b/chrome/browser/sync/glue/theme_data_type_controller.cc @@ -4,7 +4,8 @@ #include "chrome/browser/sync/glue/theme_data_type_controller.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" namespace browser_sync { diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index bfc0fec..94d3255 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.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" @@ -67,6 +66,7 @@ #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/dom_distiller/core/dom_distiller_service.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "sync/api/syncable_service.h" #if defined(ENABLE_MANAGED_USERS) @@ -123,8 +123,7 @@ ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( Profile* profile, CommandLine* command_line) : profile_(profile), command_line_(command_line), - extension_system_( - extensions::ExtensionSystemFactory::GetForProfile(profile)), + extension_system_(extensions::ExtensionSystem::Get(profile)), web_data_service_( WebDataServiceFactory::GetAutofillWebDataForProfile( profile_, Profile::EXPLICIT_ACCESS)) { diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc index cde49ed..e6e9e3f 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_helper.cc @@ -5,7 +5,6 @@ #include "chrome/browser/sync/test/integration/sync_app_helper.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/extensions_helper.h" @@ -14,6 +13,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/sync_helper.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/id_util.h" diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.cc b/chrome/browser/sync/test/integration/sync_app_list_helper.cc index 8fce11f..2147ebe 100644 --- a/chrome/browser/sync/test/integration/sync_app_list_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_list_helper.cc @@ -6,13 +6,13 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/ui/app_list/app_list_syncable_service.h" #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/browser/extension_system.h" #include "ui/app_list/app_list_folder_item.h" #include "ui/app_list/app_list_item.h" #include "ui/app_list/app_list_model.h" diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index f26120c..7355503 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -9,12 +9,12 @@ #include "base/logging.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pending_extension_info.h" #include "extensions/browser/pending_extension_manager.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc index 4ea0ec9..8b7b0af 100644 --- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/apps_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_app_list_helper.h" @@ -16,6 +16,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" using apps_helper::DisableApp; using apps_helper::EnableApp; 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 91a9f1f..2b10199 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc @@ -82,7 +82,7 @@ scoped_ptr SyncEngine::CreateForBrowserContext( drive::DriveNotificationManager* notification_manager = drive::DriveNotificationManagerFactory::GetForBrowserContext(context); ExtensionService* extension_service = - extensions::ExtensionSystem::GetForBrowserContext( + extensions::ExtensionSystem::Get( context)->extension_service(); scoped_refptr task_runner( 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 b54d96f..ad791fe 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 @@ -19,7 +19,6 @@ #include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/api_util.h" @@ -34,6 +33,7 @@ #include "chrome/browser/sync_file_system/sync_file_type.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/common/constants.h" #include "extensions/common/extension.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.cc b/chrome/browser/sync_file_system/local/local_file_sync_service.cc index 51c908a..c0842c9 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_service.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.cc @@ -6,7 +6,6 @@ #include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/file_change.h" #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h" @@ -19,6 +18,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/storage_partition.h" +#include "extensions/browser/extension_system.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index f60c8f8..fe15206 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -34,7 +34,6 @@ #include "chrome/browser/extensions/devtools_util.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" @@ -81,6 +80,7 @@ #include "content/public/common/menu_item.h" #include "content/public/common/ssl_status.h" #include "content/public/common/url_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc index e989318..247833b 100644 --- a/chrome/browser/task_manager/extension_process_resource_provider.cc +++ b/chrome/browser/task_manager/extension_process_resource_provider.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/resource_provider.h" @@ -23,6 +22,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 5708ff8..7969f36 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -16,7 +16,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/background_resource_provider.h" #include "chrome/browser/task_manager/browser_process_resource_provider.h" @@ -37,6 +36,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/result_codes.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" #include "third_party/icu/source/i18n/unicode/coll.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 578e791..2b24a20 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_service.h" @@ -38,6 +37,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index e5ef54d..20fa50e 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -13,7 +13,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.h" #include "chrome/browser/managed_mode/managed_user_theme.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_pack.h" @@ -24,6 +23,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/themes/theme_syncable_service.cc index 9a78756..78065b3 100644 --- a/chrome/browser/themes/theme_syncable_service.cc +++ b/chrome/browser/themes/theme_syncable_service.cc @@ -6,11 +6,11 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "sync/protocol/sync.pb.h" #include "sync/protocol/theme_specifics.pb.h" diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc index 01509cc..b11ad07 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/launch_util.h" @@ -15,6 +14,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc index 0d84542..682646b 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc @@ -6,13 +6,13 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/app_list/app_list_service_impl.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "net/base/url_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm index 86e9c82..fd5986e 100644 --- a/chrome/browser/ui/app_list/app_list_service_mac.mm +++ b/chrome/browser/ui/app_list/app_list_service_mac.mm @@ -18,7 +18,6 @@ #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h" #include "chrome/browser/ui/app_list/app_list_positioner.h" @@ -37,6 +36,7 @@ #include "chrome/common/mac/app_mode_common.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "grit/chrome_unscaled_resources.h" #include "grit/google_chrome_strings.h" #include "net/base/url_util.h" diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc index 0701b0c..e75e2ca 100644 --- a/chrome/browser/ui/app_list/app_list_syncable_service.cc +++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_service.h" #include "chrome/browser/ui/app_list/extension_app_item.h" @@ -16,6 +15,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_data.h" #include "sync/api/sync_merge_result.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 72def97..6b4ef3e 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,12 @@ #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/extensions/extension_system.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" namespace app_list { diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc index c771294..6ed3589 100644 --- a/chrome/browser/ui/app_list/extension_app_item.cc +++ b/chrome/browser/ui/app_list/extension_app_item.cc @@ -6,7 +6,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_context_menu.h" @@ -22,6 +21,7 @@ #include "content/public/browser/user_metrics.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc index d5f27b3..6e7871d 100644 --- a/chrome/browser/ui/app_list/extension_app_model_builder.cc +++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc @@ -10,7 +10,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" @@ -22,6 +21,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/app_list/extension_uninstaller.cc b/chrome/browser/ui/app_list/extension_uninstaller.cc index b8b8b66..38ae50d 100644 --- a/chrome/browser/ui/app_list/extension_uninstaller.cc +++ b/chrome/browser/ui/app_list/extension_uninstaller.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/app_list/extension_uninstaller.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" ExtensionUninstaller::ExtensionUninstaller( diff --git a/chrome/browser/ui/app_list/recommended_apps.cc b/chrome/browser/ui/app_list/recommended_apps.cc index 15e2fd9..1d5c796 100644 --- a/chrome/browser/ui/app_list/recommended_apps.cc +++ b/chrome/browser/ui/app_list/recommended_apps.cc @@ -12,6 +12,7 @@ #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" diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc index d977633..085d1a3 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider.cc @@ -9,7 +9,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.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/search/app_result.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/ui/app_list/search/people/people_result.cc b/chrome/browser/ui/app_list/search/people/people_result.cc index 549f53d..8668d63 100644 --- a/chrome/browser/ui/app_list/search/people/people_result.cc +++ b/chrome/browser/ui/app_list/search/people/people_result.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/extensions/extension_system.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" @@ -21,6 +20,7 @@ #include "chrome/common/extensions/api/hangouts_private.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc index bbb806c..fdcc448 100644 --- a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc +++ b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/ephemeral_app_launcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" @@ -23,6 +22,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_switches.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc index 34ffa7c..0377788 100644 --- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc +++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc @@ -10,7 +10,6 @@ #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" @@ -19,6 +18,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "content/public/common/javascript_message_type.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" @@ -35,7 +35,7 @@ namespace { extensions::ProcessManager* GetExtensionsProcessManager( WebContents* web_contents) { #if defined(ENABLE_EXTENSIONS) - return extensions::ExtensionSystem::GetForBrowserContext( + return extensions::ExtensionSystem::Get( web_contents->GetBrowserContext())->process_manager(); #else return NULL; diff --git a/chrome/browser/ui/ash/app_sync_ui_state.cc b/chrome/browser/ui/ash/app_sync_ui_state.cc index 522004f..c911e4a 100644 --- a/chrome/browser/ui/ash/app_sync_ui_state.cc +++ b/chrome/browser/ui/ash/app_sync_ui_state.cc @@ -7,7 +7,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" @@ -16,6 +15,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pending_extension_manager.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc index b0253b9..1208e15 100644 --- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc +++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +19,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "ipc/ipc_message_macros.h" @@ -108,7 +108,7 @@ void AshKeyboardControllerProxy::RequestAudioInput( GURL origin(request.security_origin); if (origin.SchemeIs(extensions::kExtensionScheme)) { ExtensionService* extensions_service = - extensions::ExtensionSystem::GetForBrowserContext( + extensions::ExtensionSystem::Get( GetBrowserContext())->extension_service(); extension = extensions_service->extensions()->GetByID(origin.host()); DCHECK(extension); @@ -236,8 +236,7 @@ void AshKeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) { // is supported. content::BrowserContext* context = GetBrowserContext(); extensions::EventRouter* router = - extensions::ExtensionSystem::GetForBrowserContext(context)-> - event_router(); + extensions::ExtensionSystem::Get(context)->event_router(); if (!router->HasEventListener( virtual_keyboard_private::OnTextInputBoxFocused::kEventName)) { diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc index acca86f..acc39ab 100644 --- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chromeos/file_manager/app_id.h" #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" @@ -21,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_system.h" ChromeNewWindowDelegateChromeos::ChromeNewWindowDelegateChromeos() {} ChromeNewWindowDelegateChromeos::~ChromeNewWindowDelegateChromeos() {} diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc index eb534bd..0ce1845 100644 --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc @@ -8,7 +8,6 @@ #include "ash/shelf/shelf_model.h" #include "ash/shell.h" #include "ash/wm/window_util.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h" @@ -27,6 +26,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "ui/aura/window.h" #include "ui/events/event.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index 783533f..10efedb 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -28,7 +28,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/app_icon_loader_impl.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/favicon/favicon_tab_helper.h" @@ -71,6 +70,7 @@ #include "content/public/browser/notification_registrar.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/extension_resource.h" #include "extensions/common/url_pattern.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 5ae4c6a..91c85d8 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -30,7 +30,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_service.h" @@ -51,6 +50,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/switches.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 89b39da..b21cca2 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -53,7 +53,6 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/extensions/browser_extension_window_controller.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/file_select_helper.h" @@ -173,6 +172,7 @@ #include "content/public/common/renderer_preferences.h" #include "content/public/common/webplugininfo.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 1dd65da..198f56d 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/lifetime/application_lifetime.h" @@ -74,6 +73,7 @@ #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 20ffd57..cd5aa27 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" @@ -32,6 +31,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" #include "grit/theme_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm index 8572a16..dfdd946 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/profiles/profile.h" @@ -25,6 +24,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 6151b07..a9400f6 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc @@ -15,7 +15,6 @@ #include "chrome/browser/apps/per_app_settings_service.h" #include "chrome/browser/apps/per_app_settings_service_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" @@ -42,6 +41,7 @@ #include "content/public/common/renderer_preferences.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/extensions/extension_enable_flow.cc b/chrome/browser/ui/extensions/extension_enable_flow.cc index 991dd8c..03534bfa 100644 --- a/chrome/browser/ui/extensions/extension_enable_flow.cc +++ b/chrome/browser/ui/extensions/extension_enable_flow.cc @@ -6,12 +6,13 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" using extensions::Extension; diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 6d9ace4..8cea014 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -21,7 +21,6 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" @@ -40,6 +39,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/media_utils.cc b/chrome/browser/ui/media_utils.cc index a764d5b..8e35eba 100644 --- a/chrome/browser/ui/media_utils.cc +++ b/chrome/browser/ui/media_utils.cc @@ -5,8 +5,9 @@ #include "chrome/browser/ui/media_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" +#include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" class Profile; diff --git a/chrome/browser/ui/omnibox/location_bar.cc b/chrome/browser/ui/omnibox/location_bar.cc index 5f6d279..c0ac254 100644 --- a/chrome/browser/ui/omnibox/location_bar.cc +++ b/chrome/browser/ui/omnibox/location_bar.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "extensions/common/permissions/permissions_data.h" @@ -21,8 +21,7 @@ LocationBar::~LocationBar() { bool LocationBar::IsBookmarkStarHiddenByExtension() const { const ExtensionService* extension_service = - extensions::ExtensionSystem::GetForBrowserContext( - profile_)->extension_service(); + extensions::ExtensionSystem::Get(profile_)->extension_service(); // Extension service may be NULL during unit test execution. if (!extension_service) return false; diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index c230bea..af99141 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" #include "chrome/browser/extensions/api/tabs/windows_event_router.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/extensions/window_controller.h" @@ -36,6 +35,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 54b78f2..884a709 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/infobar_service.h" @@ -43,6 +42,7 @@ #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 329f533..926f8e4 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -32,7 +32,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_creator.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/first_run/first_run.h" @@ -88,6 +87,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index 57fc101..82d41be 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc @@ -12,7 +12,6 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_db_task.h" #include "chrome/browser/history/history_service.h" @@ -20,6 +19,7 @@ #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc index 26d5eec..c94be9e 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/dev_mode_bubble_controller.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "grit/locale_settings.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc index ce3f5e8..6a28051 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chromeos/file_manager/select_file_dialog_util.h" #include "chrome/browser/chromeos/file_manager/url_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" @@ -32,6 +31,7 @@ #include "chrome/browser/ui/views/extensions/extension_dialog.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_system.h" #include "ui/base/base_window.h" #include "ui/shell_dialogs/selected_file_info.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc index da95dea..eb25964 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc @@ -8,7 +8,6 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/extensions/tab_helper.h" @@ -24,6 +23,7 @@ #include "chrome/browser/ui/views/toolbar/browser_action_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/pref_names.h" #include "extensions/browser/runtime_data.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/toolbar/site_chip_view.cc b/chrome/browser/ui/views/toolbar/site_chip_view.cc index 9124293..d6511ef 100644 --- a/chrome/browser/ui/views/toolbar/site_chip_view.cc +++ b/chrome/browser/ui/views/toolbar/site_chip_view.cc @@ -12,7 +12,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_icon_image.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/client_side_detection_host.h" @@ -35,6 +34,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "grit/component_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.cc b/chrome/browser/ui/webui/app_list/start_page_handler.cc index c93dab2..ccd22a8 100644 --- a/chrome/browser/ui/webui/app_list/start_page_handler.cc +++ b/chrome/browser/ui/webui/app_list/start_page_handler.cc @@ -10,7 +10,6 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/app_list_service.h" @@ -21,6 +20,7 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "ui/app_list/speech_ui_model_observer.h" #include "ui/events/event_constants.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index b1cd351..3c982fc 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -33,7 +33,6 @@ #include "chrome/browser/download/drag_download_item.h" #include "chrome/browser/extensions/api/downloads/downloads_api.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/fileicon_source.h" @@ -46,6 +45,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/time_format.h" diff --git a/chrome/browser/ui/webui/extensions/command_handler.cc b/chrome/browser/ui/webui/extensions/command_handler.cc index 4ddc4a8..00eac63 100644 --- a/chrome/browser/ui/webui/extensions/command_handler.cc +++ b/chrome/browser/ui/webui/extensions/command_handler.cc @@ -10,10 +10,10 @@ #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/extensions/extension_error_handler.cc b/chrome/browser/ui/webui/extensions/extension_error_handler.cc index 270bd50..38ad41e 100644 --- a/chrome/browser/ui/webui/extensions/extension_error_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_error_handler.cc @@ -14,7 +14,6 @@ #include "base/values.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -25,6 +24,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "extensions/browser/extension_error.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/file_highlighter.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index d4481df..224ddd3 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -14,7 +14,6 @@ #include "base/strings/stringprintf.h" #include "base/threading/thread.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -23,6 +22,7 @@ #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/component_extension_resources_map.h" diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc index 31d466c..b2dbfd0 100644 --- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc +++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc @@ -9,7 +9,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" @@ -19,6 +18,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc index 7af69c1..de9dd0f 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -24,6 +23,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" using extensions::Extension; diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index a2118e9..b2b18e2 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -35,7 +35,6 @@ #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_warning_set.h" @@ -72,6 +71,7 @@ #include "extensions/browser/blacklist_state.h" #include "extensions/browser/extension_error.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/management_policy.h" #include "extensions/browser/pref_names.h" diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.cc b/chrome/browser/ui/webui/extensions/install_extension_handler.cc index e003047..3463c09 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.cc +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h" @@ -18,6 +17,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/common/drop_data.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 1058e07..5b1ed0e 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -34,7 +34,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/chrome_network_delegate.h" @@ -58,6 +57,7 @@ #include "content/public/browser/web_ui.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 "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index cc4cdeb..a5fed58 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -21,7 +21,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -49,6 +48,7 @@ #include "content/public/common/favicon_url.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #include "extensions/browser/pref_names.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index fb23688..a19c17a 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc @@ -18,7 +18,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" @@ -33,6 +32,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index 2faa068..30b2fe9 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/common/net/url_fixer_upper.h" @@ -27,6 +26,7 @@ #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_pref_value_map.h" #include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index 22e64c4..2648ea2 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -19,7 +19,6 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" @@ -29,6 +28,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc index ec9c2e5..d5a2255 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc @@ -9,7 +9,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index 6a081be..800f218 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -69,7 +69,7 @@ #if !defined(OS_ANDROID) && !defined(OS_IOS) #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc index 1849ec9..88147f1 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc @@ -10,12 +10,12 @@ #include "base/bind_helpers.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "grit/sync_file_system_internals_resources.h" @@ -36,7 +36,7 @@ void ExtensionStatusesHandler::RegisterMessages() { base::Unretained(this))); } -//static +// static void ExtensionStatusesHandler::GetExtensionStatusesAsDictionary( Profile* profile, base::ListValue* values) { diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 3d4e2e8..d83e48b 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -749,8 +749,8 @@ 'browser/extensions/extension_sync_service.h', 'browser/extensions/extension_sync_service_factory.cc', 'browser/extensions/extension_sync_service_factory.h', - 'browser/extensions/extension_system.cc', - 'browser/extensions/extension_system.h', + 'browser/extensions/extension_system_impl.cc', + 'browser/extensions/extension_system_impl.h', 'browser/extensions/extension_sync_bundle.cc', 'browser/extensions/extension_sync_bundle.h', 'browser/extensions/extension_system_factory.cc', diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index c7ec8e3..39414db 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -22,7 +22,6 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/favicon/favicon_service.h" @@ -69,6 +68,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index cc07d07..97d8cdb 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -18,7 +18,7 @@ include_rules = [ "+chrome/browser/extensions/extension_function_histogram_value.h", "+chrome/browser/extensions/extension_host.h", "+chrome/browser/extensions/extension_service.h", - "+chrome/browser/extensions/extension_system.h", + "+chrome/browser/extensions/extension_system_factory.h", "+chrome/browser/extensions/extension_util.h", "+chrome/browser/renderer_host/chrome_render_message_filter.h", "+chrome/common/extensions/extension_messages.h", diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc index fa35304..29661be 100644 --- a/extensions/browser/event_router.cc +++ b/extensions/browser/event_router.cc @@ -13,13 +13,13 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" @@ -81,8 +81,7 @@ void EventRouter::NotifyExtensionDispatchObserverOnUIThread( reinterpret_cast(browser_context_id); if (!ExtensionsBrowserClient::Get()->IsValidContext(context)) return; - ExtensionSystem* extension_system = - ExtensionSystem::GetForBrowserContext(context); + ExtensionSystem* extension_system = ExtensionSystem::Get(context); EventRouter* event_router = extension_system->event_router(); if (!event_router) return; @@ -573,8 +572,7 @@ bool EventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent( if (extension->is_ephemeral() && !event->can_load_ephemeral_apps) { // Most events can only be dispatched to ephemeral apps that are already // running. - ProcessManager* pm = - ExtensionSystem::GetForBrowserContext(context)->process_manager(); + ProcessManager* pm = ExtensionSystem::Get(context)->process_manager(); if (!pm->GetBackgroundHostForExtension(extension->id())) return false; } @@ -582,7 +580,7 @@ bool EventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent( if (!CanDispatchEventToBrowserContext(context, extension, event)) return false; - LazyBackgroundTaskQueue* queue = ExtensionSystem::GetForBrowserContext( + LazyBackgroundTaskQueue* queue = ExtensionSystem::Get( context)->lazy_background_task_queue(); if (queue->ShouldEnqueueTask(context, extension)) { linked_ptr dispatched_event(event); @@ -616,8 +614,7 @@ void EventRouter::IncrementInFlightEventsOnUI( reinterpret_cast(browser_context_id); if (!ExtensionsBrowserClient::Get()->IsValidContext(browser_context)) return; - ExtensionSystem* extension_system = - ExtensionSystem::GetForBrowserContext(browser_context); + ExtensionSystem* extension_system = ExtensionSystem::Get(browser_context); EventRouter* event_router = extension_system->event_router(); if (!event_router) return; @@ -634,8 +631,7 @@ void EventRouter::IncrementInFlightEvents(BrowserContext* context, // Only increment in-flight events if the lazy background page is active, // because that's the only time we'll get an ACK. if (BackgroundInfo::HasLazyBackgroundPage(extension)) { - ProcessManager* pm = - ExtensionSystem::GetForBrowserContext(context)->process_manager(); + ProcessManager* pm = ExtensionSystem::Get(context)->process_manager(); ExtensionHost* host = pm->GetBackgroundHostForExtension(extension->id()); if (host) pm->IncrementLazyKeepaliveCount(extension); @@ -644,8 +640,7 @@ void EventRouter::IncrementInFlightEvents(BrowserContext* context, void EventRouter::OnEventAck(BrowserContext* context, const std::string& extension_id) { - ProcessManager* pm = - ExtensionSystem::GetForBrowserContext(context)->process_manager(); + ProcessManager* pm = ExtensionSystem::Get(context)->process_manager(); ExtensionHost* host = pm->GetBackgroundHostForExtension(extension_id); // The event ACK is routed to the background host, so this should never be // NULL. @@ -687,7 +682,7 @@ void EventRouter::Observe(int type, const Extension* extension = content::Details(details).ptr(); if (BackgroundInfo::HasLazyBackgroundPage(extension)) { - LazyBackgroundTaskQueue* queue = ExtensionSystem::GetForBrowserContext( + LazyBackgroundTaskQueue* queue = ExtensionSystem::Get( browser_context_)->lazy_background_task_queue(); queue->AddPendingTask(browser_context_, extension->id(), base::Bind(&DoNothing)); diff --git a/extensions/browser/extension_system.cc b/extensions/browser/extension_system.cc new file mode 100644 index 0000000..2924a74 --- /dev/null +++ b/extensions/browser/extension_system.cc @@ -0,0 +1,22 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "extensions/browser/extension_system.h" + +#include "chrome/browser/extensions/extension_system_factory.h" + +namespace extensions { + +ExtensionSystem::ExtensionSystem() { +} + +ExtensionSystem::~ExtensionSystem() { +} + +// static +ExtensionSystem* ExtensionSystem::Get(content::BrowserContext* context) { + return ExtensionSystemFactory::GetForBrowserContext(context); +} + +} // namespace extensions diff --git a/extensions/browser/extension_system.h b/extensions/browser/extension_system.h new file mode 100644 index 0000000..18555e5 --- /dev/null +++ b/extensions/browser/extension_system.h @@ -0,0 +1,127 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef EXTENSIONS_BROWSER_EXTENSION_SYSTEM_H_ +#define EXTENSIONS_BROWSER_EXTENSION_SYSTEM_H_ + +#include + +#include "base/memory/ref_counted.h" +#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "extensions/common/extension.h" + +class ExtensionService; + +#if defined(OS_CHROMEOS) +namespace chromeos { +class DeviceLocalAccountManagementPolicyProvider; +} +#endif // defined(OS_CHROMEOS) + +namespace content { +class BrowserContext; +} + +namespace extensions { + +class Blacklist; +class ErrorConsole; +class EventRouter; +class Extension; +class ExtensionWarningService; +class InfoMap; +class InstallVerifier; +class LazyBackgroundTaskQueue; +class ManagementPolicy; +class OneShotEvent; +class ProcessManager; +class RuntimeData; +class StateStore; +class UserScriptMaster; + +// ExtensionSystem manages the lifetime of many of the services used by the +// extensions and apps system, and it handles startup and shutdown as needed. +// Eventually, we'd like to make more of these services into +// BrowserContextKeyedServices in their own right. +class ExtensionSystem : public BrowserContextKeyedService { + public: + ExtensionSystem(); + virtual ~ExtensionSystem(); + + // Returns the instance for the given browser context, or NULL if none. + // A convenience wrapper around ExtensionSystemFactory::GetForBrowserContext. + static ExtensionSystem* Get(content::BrowserContext* context); + + // Initializes extensions machinery. + // Component extensions are always enabled, external and user extensions are + // controlled by |extensions_enabled|. + virtual void InitForRegularProfile(bool extensions_enabled) = 0; + + // The ExtensionService is created at startup. + virtual ExtensionService* extension_service() = 0; + + // Per-extension data that can change during the life of the process but + // does not persist across restarts. Lives on UI thread. Created at startup. + virtual RuntimeData* runtime_data() = 0; + + // The class controlling whether users are permitted to perform certain + // actions on extensions (install, uninstall, disable, etc.). + // The ManagementPolicy is created at startup. + virtual ManagementPolicy* management_policy() = 0; + + // The UserScriptMaster is created at startup. + virtual UserScriptMaster* user_script_master() = 0; + + // The ProcessManager is created at startup. + virtual ProcessManager* process_manager() = 0; + + // The StateStore is created at startup. + virtual StateStore* state_store() = 0; + + // The rules store is created at startup. + virtual StateStore* rules_store() = 0; + + // Returns the IO-thread-accessible extension data. + virtual InfoMap* info_map() = 0; + + // The LazyBackgroundTaskQueue is created at startup. + virtual LazyBackgroundTaskQueue* lazy_background_task_queue() = 0; + + // The EventRouter is created at startup. + virtual EventRouter* event_router() = 0; + + // The ExtensionWarningService is created at startup. + virtual ExtensionWarningService* warning_service() = 0; + + // The blacklist is created at startup. + virtual Blacklist* blacklist() = 0; + + // The ErrorConsole is created at startup. + virtual ErrorConsole* error_console() = 0; + + // The InstallVerifier is created at startup. + virtual InstallVerifier* install_verifier() = 0; + + // Called by the ExtensionService that lives in this system. Gives the + // info map a chance to react to the load event before the EXTENSION_LOADED + // notification has fired. The purpose for handling this event first is to + // avoid race conditions by making sure URLRequestContexts learn about new + // extensions before anything else needs them to know. + virtual void RegisterExtensionWithRequestContexts( + const Extension* extension) {} + + // Called by the ExtensionService that lives in this system. Lets the + // info map clean up its RequestContexts once all the listeners to the + // EXTENSION_UNLOADED notification have finished running. + virtual void UnregisterExtensionWithRequestContexts( + const std::string& extension_id, + const UnloadedExtensionInfo::Reason reason) {} + + // Signaled when the extension system has completed its startup tasks. + virtual const OneShotEvent& ready() const = 0; +}; + +} // namespace extensions + +#endif // EXTENSIONS_BROWSER_EXTENSION_SYSTEM_H_ diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc index 2a52503..2b38ce9 100644 --- a/extensions/browser/lazy_background_task_queue.cc +++ b/extensions/browser/lazy_background_task_queue.cc @@ -7,7 +7,6 @@ #include "base/callback.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_service.h" @@ -16,6 +15,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" @@ -44,7 +44,7 @@ bool LazyBackgroundTaskQueue::ShouldEnqueueTask( const Extension* extension) { DCHECK(extension); if (BackgroundInfo::HasBackgroundPage(extension)) { - ProcessManager* pm = ExtensionSystem::GetForBrowserContext( + ProcessManager* pm = ExtensionSystem::Get( browser_context)->process_manager(); DCHECK(pm); ExtensionHost* background_host = @@ -79,7 +79,7 @@ void LazyBackgroundTaskQueue::AddPendingTask( if (extension && BackgroundInfo::HasLazyBackgroundPage(extension)) { // If this is the first enqueued task, and we're not waiting for the // background page to unload, ensure the background page is loaded. - ProcessManager* pm = ExtensionSystem::GetForBrowserContext( + ProcessManager* pm = ExtensionSystem::Get( browser_context)->process_manager(); pm->IncrementLazyKeepaliveCount(extension); // Creating the background host may fail, e.g. if |profile| is incognito @@ -127,7 +127,7 @@ void LazyBackgroundTaskQueue::ProcessPendingTasks( // Balance the keepalive in AddPendingTask. Note we don't do this on a // failure to load, because the keepalive count is reset in that case. if (host && BackgroundInfo::HasLazyBackgroundPage(extension)) { - ExtensionSystem::GetForBrowserContext(browser_context)->process_manager()-> + ExtensionSystem::Get(browser_context)->process_manager()-> DecrementLazyKeepaliveCount(extension); } } diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc index 217d389..53d39fdc 100644 --- a/extensions/browser/process_manager.cc +++ b/extensions/browser/process_manager.cc @@ -17,7 +17,6 @@ #include "chrome/browser/extensions/api/runtime/runtime_api.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_context.h" @@ -35,6 +34,7 @@ #include "content/public/browser/web_contents_user_data.h" #include "content/public/common/renderer_preferences.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" @@ -128,8 +128,7 @@ class RenderViewHostDestructionObserver explicit RenderViewHostDestructionObserver(WebContents* web_contents) : WebContentsObserver(web_contents) { BrowserContext* context = web_contents->GetBrowserContext(); - process_manager_ = - ExtensionSystem::GetForBrowserContext(context)->process_manager(); + process_manager_ = ExtensionSystem::Get(context)->process_manager(); } friend class content::WebContentsUserData; @@ -570,7 +569,7 @@ void ProcessManager::CancelSuspend(const Extension* extension) { } void ProcessManager::OnBrowserWindowReady() { - ExtensionService* service = ExtensionSystem::GetForBrowserContext( + ExtensionService* service = ExtensionSystem::Get( GetBrowserContext())->extension_service(); // On Chrome OS, a login screen is implemented as a browser. // This browser has no extension service. In this case, @@ -613,7 +612,7 @@ void ProcessManager::Observe(int type, case chrome::NOTIFICATION_EXTENSION_LOADED: { BrowserContext* context = content::Source(source).ptr(); - ExtensionSystem* system = ExtensionSystem::GetForBrowserContext(context); + ExtensionSystem* system = ExtensionSystem::Get(context); if (system->ready().is_signaled()) { // The extension system is ready, so create the background host. const Extension* extension = @@ -853,8 +852,8 @@ IncognitoProcessManager::IncognitoProcessManager( BrowserContext* incognito_context, BrowserContext* original_context) : ProcessManager(incognito_context, original_context), - original_manager_(ExtensionSystem::GetForBrowserContext( - original_context)->process_manager()) { + original_manager_( + ExtensionSystem::Get(original_context)->process_manager()) { DCHECK(incognito_context->IsOffTheRecord()); // The original profile will have its own ProcessManager to diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 4b2a308..7cfaa77 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -196,6 +196,8 @@ 'browser/extension_registry_factory.h', 'browser/extension_registry_observer.h', 'browser/extension_scoped_prefs.h', + 'browser/extension_system.cc', + 'browser/extension_system.h', 'browser/extensions_browser_client.cc', 'browser/extensions_browser_client.h', 'browser/external_provider_interface.h', -- cgit v1.1