From 301116c6aec4483ffbecf0d288c7ed6379078666 Mon Sep 17 00:00:00 2001 From: "benwells@chromium.org" Date: Tue, 26 Nov 2013 10:37:45 +0000 Subject: [PATCH] Move some dependencies of ExtensionService down to extensions. These files do not have any dependencies to the rest of chrome so can move down immediately. TBR=miket, sky BUG=298537 Review URL: https://codereview.chromium.org/82773002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237299 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_content_browser_client.cc | 2 +- ...ce_local_account_external_policy_loader_unittest.cc | 2 +- .../device_local_account_management_policy_provider.h | 2 +- .../api/developer_private/developer_private_api.cc | 6 +++--- .../extensions/api/management/management_api.cc | 2 +- .../extensions/api/management/management_apitest.cc | 2 +- chrome/browser/extensions/crx_installer.cc | 2 +- .../extensions/extension_context_menu_browsertest.cc | 2 +- .../browser/extensions/extension_context_menu_model.cc | 2 +- .../extension_context_menu_model_unittest.cc | 2 +- chrome/browser/extensions/extension_installer.cc | 2 +- chrome/browser/extensions/extension_protocols.cc | 2 +- chrome/browser/extensions/extension_service.cc | 6 +++--- chrome/browser/extensions/extension_service.h | 7 +++---- .../browser/extensions/extension_service_unittest.cc | 6 +++--- chrome/browser/extensions/extension_system.cc | 2 +- chrome/browser/extensions/extension_ui_unittest.cc | 2 +- .../extensions/external_policy_loader_unittest.cc | 2 +- chrome/browser/extensions/external_provider_impl.cc | 2 +- chrome/browser/extensions/external_provider_impl.h | 3 +-- chrome/browser/extensions/install_verifier.h | 2 +- chrome/browser/extensions/installed_loader.cc | 2 +- .../extensions/standard_management_policy_provider.h | 2 +- chrome/browser/extensions/test_extension_system.cc | 2 +- chrome/browser/extensions/webstore_installer.cc | 2 +- chrome/browser/extensions/webstore_installer.h | 2 +- chrome/browser/managed_mode/managed_user_service.h | 2 +- chrome/browser/nacl_host/nacl_browser_delegate_impl.cc | 2 +- chrome/browser/profile_resetter/profile_resetter.cc | 2 +- .../ui/app_list/app_list_controller_delegate.cc | 2 +- .../ui/webui/extensions/extension_settings_handler.cc | 2 +- chrome/browser/ui/webui/ntp/app_launcher_handler.cc | 2 +- chrome/chrome_browser_extensions.gypi | 3 --- chrome/chrome_common.gypi | 2 -- chrome/chrome_tests_unit.gypi | 8 ++++---- chrome/common/extensions/chrome_manifest_handlers.cc | 2 +- chrome/common/pepper_permission_util.cc | 2 +- extensions/browser/DEPS | 2 +- .../browser}/external_provider_interface.h | 8 ++++---- .../browser}/management_policy.cc | 4 ++-- .../browser}/management_policy.h | 8 ++++---- .../browser}/management_policy_unittest.cc | 6 +++--- .../browser}/test_management_policy.cc | 4 ++-- .../browser}/test_management_policy.h | 10 +++++----- extensions/common/DEPS | 8 ++++++++ .../common}/manifest_handlers/shared_module_info.cc | 4 ++-- .../common}/manifest_handlers/shared_module_info.h | 8 ++++---- .../shared_module_manifest_unittest.cc | 6 +++--- extensions/extensions.gyp | 5 +++++ 49 files changed, 89 insertions(+), 83 deletions(-) rename {chrome/browser/extensions => extensions/browser}/external_provider_interface.h (92%) rename {chrome/browser/extensions => extensions/browser}/management_policy.cc (96%) rename {chrome/browser/extensions => extensions/browser}/management_policy.h (96%) rename {chrome/browser/extensions => extensions/browser}/management_policy_unittest.cc (97%) rename {chrome/browser/extensions => extensions/browser}/test_management_policy.cc (94%) rename {chrome/browser/extensions => extensions/browser}/test_management_policy.h (85%) rename {chrome/common/extensions => extensions/common}/manifest_handlers/shared_module_info.cc (98%) rename {chrome/common/extensions => extensions/common}/manifest_handlers/shared_module_info.h (87%) rename {chrome/common/extensions => extensions/common}/manifest_handlers/shared_module_manifest_unittest.cc (96%) diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 2de42fc05925bb..7864eee5cc0e4a 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -92,7 +92,6 @@ #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "chrome/common/extensions/web_accessible_resources_handler.h" #include "chrome/common/logging_chrome.h" @@ -130,6 +129,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc index 765ceab2f2681e..68281df218c7c6 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc @@ -18,7 +18,6 @@ #include "base/version.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/extensions/external_provider_interface.h" #include "chrome/browser/extensions/updater/extension_downloader.h" #include "chrome/browser/policy/cloud/mock_cloud_policy_store.h" #include "chrome/common/chrome_paths.h" @@ -31,6 +30,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/external_provider_interface.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h index c19fe1ac14260b..7e25e2f54cd297 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h +++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/chromeos/policy/device_local_account.h" -#include "chrome/browser/extensions/management_policy.h" +#include "extensions/browser/management_policy.h" namespace chromeos { 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 1f6baa00f28000..05f1342bb40d23 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -28,7 +28,6 @@ #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/management_policy.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/platform_util.h" @@ -50,6 +49,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/management_policy.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension_resource.h" @@ -962,7 +962,7 @@ bool DeveloperPrivateExportSyncfsFolderToLocalfsFunction::RunImpl() { base::FilePath::StringType project_name; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &project_name)); if (!ValidateFolderName(project_name)) { - DLOG(INFO) << "Invalid project_name : [" << project_name << "]"; + DVLOG(0) << "Invalid project_name : [" << project_name << "]"; return false; } @@ -1125,7 +1125,7 @@ bool DeveloperPrivateLoadProjectFunction::RunImpl() { base::FilePath::StringType project_name; EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &project_name)); if (!ValidateFolderName(project_name)) { - DLOG(INFO) << "Invalid project_name : [" << project_name << "]"; + DVLOG(0) << "Invalid project_name : [" << project_name << "]"; return false; } diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index b376bd347db587..3d10dd7366fbf5 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -24,7 +24,6 @@ #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/management_policy.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" @@ -40,6 +39,7 @@ #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc index 9f8c532566a234..2dd49e6b91f072 100644 --- a/chrome/browser/extensions/api/management/management_apitest.cc +++ b/chrome/browser/extensions/api/management/management_apitest.cc @@ -9,7 +9,6 @@ #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/test_management_policy.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/test_management_policy.h" #include "extensions/common/manifest.h" using extensions::Extension; diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index e279b348c7b189..073082de6e4c71 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -38,7 +38,6 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" @@ -46,6 +45,7 @@ #include "content/public/browser/user_metrics.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 27ce27954baacc..dc641341f9b96f 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -9,13 +9,13 @@ #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/extensions/test_management_policy.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/render_view_context_menu.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 "content/public/common/context_menu_params.h" +#include "extensions/browser/test_management_policy.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 96f568f9688107..d28bdea6a4e138 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -12,7 +12,6 @@ #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/management_policy.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" @@ -22,6 +21,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc index 2ac16fdfebc1c2..c56cb3ad57ddc2 100644 --- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc +++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc @@ -6,11 +6,11 @@ #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/test_management_policy.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/test_management_policy.h" #include "extensions/common/extension_builder.h" #include "extensions/common/value_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_installer.cc b/chrome/browser/extensions/extension_installer.cc index 5e3d9b2e55c73e..7d47df1d3208c8 100644 --- a/chrome/browser/extensions/extension_installer.cc +++ b/chrome/browser/extensions/extension_installer.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/management_policy.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index d3ad2f0d9a390b..994cd52698381b 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -30,7 +30,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/csp_handler.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/extensions/web_accessible_resources_handler.h" #include "chrome/common/extensions/webview_handler.h" @@ -44,6 +43,7 @@ #include "extensions/common/file_util.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "grit/component_extension_resources_map.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 54f37b565029ca..0eac6e0142c564 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -49,10 +49,8 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/external_install_ui.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/extensions/external_provider_interface.h" #include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/installed_loader.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/extensions/unpacked_installer.h" @@ -73,7 +71,6 @@ #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -88,6 +85,8 @@ #include "content/public/browser/url_data_source.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/external_provider_interface.h" +#include "extensions/browser/management_policy.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" @@ -98,6 +97,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 5d69ec9ff79f2a..11a7ca9ce4749b 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -20,25 +20,24 @@ #include "base/strings/string16.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/extension_function_histogram_value.h" -#include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/browser/extensions/external_provider_interface.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/extensions/pending_enables.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/update_observer.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/external_provider_interface.h" +#include "extensions/browser/management_policy.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" #include "extensions/browser/quota_service.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/one_shot_event.h" class CommandLine; diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 1579629732df95..8dc8873ec4f4a7 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -50,18 +50,15 @@ #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/external_pref_loader.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/extensions/external_provider_interface.h" #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h" #include "chrome/browser/extensions/install_observer.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/installed_loader.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/extensions/pending_extension_info.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/extensions/test_management_policy.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/prefs/browser_prefs.h" @@ -92,6 +89,9 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_constants.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/external_provider_interface.h" +#include "extensions/browser/management_policy.h" +#include "extensions/browser/test_management_policy.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index 0e5911a6e24d26..377c9dafe227b2 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -25,7 +25,6 @@ #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/management_policy.h" #include "chrome/browser/extensions/navigation_observer.h" #include "chrome/browser/extensions/standard_management_policy_provider.h" #include "chrome/browser/extensions/state_store.h" @@ -42,6 +41,7 @@ #include "extensions/browser/event_router.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/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index a7e88b964a27ad..d981011b4bb150 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -8,12 +8,12 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc index 067c38d6eebd10..8f70dbad6e2c26 100644 --- a/chrome/browser/extensions/external_policy_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_loader_unittest.cc @@ -11,11 +11,11 @@ #include "base/version.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/extensions/external_provider_interface.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/browser/external_provider_interface.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index 9312501f1f8a5a..5db54b63d1371e 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -23,12 +23,12 @@ #include "chrome/browser/extensions/external_component_loader.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/external_pref_loader.h" -#include "chrome/browser/extensions/external_provider_interface.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/external_provider_interface.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/external_provider_impl.h b/chrome/browser/extensions/external_provider_impl.h index 5482582d27c5ea..d96817b367b6e5 100644 --- a/chrome/browser/extensions/external_provider_impl.h +++ b/chrome/browser/extensions/external_provider_impl.h @@ -7,10 +7,9 @@ #include -#include "chrome/browser/extensions/external_provider_interface.h" - #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/external_loader.h" +#include "extensions/browser/external_provider_interface.h" #include "extensions/common/manifest.h" class Profile; diff --git a/chrome/browser/extensions/install_verifier.h b/chrome/browser/extensions/install_verifier.h index 1c455304198ba3..1f209acb15593a 100644 --- a/chrome/browser/extensions/install_verifier.h +++ b/chrome/browser/extensions/install_verifier.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/extensions/management_policy.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" namespace net { diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index b037c0d6c2d86b..6b39ffb47b7d85 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/management_policy.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" @@ -26,6 +25,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/standard_management_policy_provider.h b/chrome/browser/extensions/standard_management_policy_provider.h index 4dd2a6845d6fc0..5ed53a7d673d48 100644 --- a/chrome/browser/extensions/standard_management_policy_provider.h +++ b/chrome/browser/extensions/standard_management_policy_provider.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_STANDARD_MANAGEMENT_POLICY_PROVIDER_H_ #define CHROME_BROWSER_EXTENSIONS_STANDARD_MANAGEMENT_POLICY_PROVIDER_H_ -#include "chrome/browser/extensions/management_policy.h" +#include "extensions/browser/management_policy.h" namespace extensions { diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index f2a30d854665be..10f39e6b4a6196 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -15,7 +15,6 @@ #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/management_policy.h" #include "chrome/browser/extensions/standard_management_policy_provider.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/extensions/user_script_master.h" @@ -26,6 +25,7 @@ #include "extensions/browser/event_router.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/info_map.h" +#include "extensions/browser/management_policy.h" #include "extensions/browser/process_manager.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 7ee4e1a61cc5b9..75e0839592e03d 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -35,7 +35,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/omaha_query_params/omaha_query_params.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" @@ -51,6 +50,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "net/base/escape.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h index 9742cc84b25c68..99ede0cf62a65a 100644 --- a/chrome/browser/extensions/webstore_installer.h +++ b/chrome/browser/extensions/webstore_installer.h @@ -15,11 +15,11 @@ #include "base/values.h" #include "base/version.h" #include "chrome/browser/extensions/extension_install_prompt.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "net/base/net_errors.h" #include "ui/gfx/image/image_skia.h" #include "url/gurl.h" diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h index 8e3bed4f92420b..15e9123908c067 100644 --- a/chrome/browser/managed_mode/managed_user_service.h +++ b/chrome/browser/managed_mode/managed_user_service.h @@ -12,7 +12,6 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/strings/string16.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/managed_mode/managed_mode_url_filter.h" #include "chrome/browser/managed_mode/managed_users.h" #include "chrome/browser/sync/profile_sync_service_observer.h" @@ -21,6 +20,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/management_policy.h" class Browser; class GoogleServiceAuthError; diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc index 756d84e76dc359..d5171a153e2708 100644 --- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc +++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc @@ -15,12 +15,12 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/logging_chrome.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/url_pattern.h" #include "ppapi/c/private/ppb_nacl_private.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc index 8d0227ddcbd3d5..be010b405ed4f8 100644 --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc @@ -9,7 +9,6 @@ #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/extensions/management_policy.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" #include "chrome/browser/profiles/profile.h" @@ -22,6 +21,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/management_policy.h" ProfileResetter::ProfileResetter(Profile* profile) : profile_(profile), 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 7e6063ecc7f754..b1bdd7d39b4391 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc @@ -8,12 +8,12 @@ #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/management_policy.h" #include "chrome/browser/ui/app_list/extension_uninstaller.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" #include "net/base/url_util.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 5b790877640223..42572abf6c2a71 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -39,7 +39,6 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_warning_set.h" -#include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/google/google_util.h" @@ -73,6 +72,7 @@ #include "content/public/browser/web_ui_data_source.h" #include "extensions/browser/extension_error.h" #include "extensions/browser/lazy_background_task_queue.h" +#include "extensions/browser/management_policy.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index d03133f97793d3..24f7026346a143 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -22,7 +22,6 @@ #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/management_policy.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_util.h" @@ -48,6 +47,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/common/favicon_url.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/management_policy.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "grit/browser_resources.h" diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 7790a3c02661dd..103b633ad0f11d 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -790,7 +790,6 @@ 'browser/extensions/external_pref_loader.h', 'browser/extensions/external_provider_impl.cc', 'browser/extensions/external_provider_impl.h', - 'browser/extensions/external_provider_interface.h', 'browser/extensions/external_registry_loader_win.cc', 'browser/extensions/external_registry_loader_win.h', 'browser/extensions/global_shortcut_listener.cc', @@ -822,8 +821,6 @@ 'browser/extensions/install_verifier.cc', 'browser/extensions/install_verifier.h', 'browser/extensions/location_bar_controller.h', - 'browser/extensions/management_policy.cc', - 'browser/extensions/management_policy.h', 'browser/extensions/menu_manager.cc', 'browser/extensions/menu_manager.h', 'browser/extensions/menu_manager_factory.cc', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index cd1dc174671979..125ffe32dafd8d 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -226,8 +226,6 @@ 'common/extensions/manifest_handlers/sandboxed_page_info.h', 'common/extensions/manifest_handlers/settings_overrides_handler.cc', 'common/extensions/manifest_handlers/settings_overrides_handler.h', - 'common/extensions/manifest_handlers/shared_module_info.cc', - 'common/extensions/manifest_handlers/shared_module_info.h', 'common/extensions/manifest_handlers/theme_handler.cc', 'common/extensions/manifest_handlers/theme_handler.h', 'common/extensions/manifest_url_handler.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 5f7251fed2e0bd..31edbc8c375bfb 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -39,6 +39,8 @@ '..', ], 'sources': [ + '../extensions/browser/test_management_policy.cc', + '../extensions/browser/test_management_policy.h', '../extensions/common/extension_builder.cc', '../extensions/common/extension_builder.h', '../extensions/common/value_builder.cc', @@ -133,8 +135,6 @@ 'browser/extensions/test_extension_service.h', 'browser/extensions/test_extension_system.cc', 'browser/extensions/test_extension_system.h', - 'browser/extensions/test_management_policy.cc', - 'browser/extensions/test_management_policy.h', 'browser/google_apis/dummy_auth_service.cc', 'browser/google_apis/dummy_auth_service.h', 'browser/google_apis/test_util.cc', @@ -530,6 +530,7 @@ '../extensions/browser/file_reader_unittest.cc', '../extensions/browser/info_map_unittest.cc', '../extensions/browser/lazy_background_task_queue_unittest.cc', + '../extensions/browser/management_policy_unittest.cc', '../extensions/browser/process_map_unittest.cc', '../extensions/browser/quota_service_unittest.cc', '../extensions/common/event_filter_unittest.cc', @@ -537,6 +538,7 @@ '../extensions/common/file_util_unittest.cc', '../extensions/common/id_util_unittest.cc', '../extensions/common/manifest_handler_unittest.cc', + '../extensions/common/manifest_handlers/shared_module_manifest_unittest.cc', '../extensions/common/matcher/regex_set_matcher_unittest.cc', '../extensions/common/matcher/string_pattern_unittest.cc', '../extensions/common/matcher/substring_set_matcher_unittest.cc', @@ -908,7 +910,6 @@ 'browser/extensions/external_provider_impl_unittest.cc', 'browser/extensions/external_provider_impl_chromeos_unittest.cc', 'browser/extensions/image_loader_unittest.cc', - 'browser/extensions/management_policy_unittest.cc', 'browser/extensions/menu_manager_unittest.cc', 'browser/extensions/pack_extension_unittest.cc', 'browser/extensions/page_action_controller_unittest.cc', @@ -1822,7 +1823,6 @@ 'common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc', 'common/extensions/manifest_handlers/externally_connectable_unittest.cc', 'common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc', - 'common/extensions/manifest_handlers/shared_module_manifest_unittest.cc', 'common/extensions/manifest_tests/extension_manifest_test.cc', 'common/extensions/manifest_tests/extension_manifests_background_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc', diff --git a/chrome/common/extensions/chrome_manifest_handlers.cc b/chrome/common/extensions/chrome_manifest_handlers.cc index e83263934786c7..daa077ec946f50 100644 --- a/chrome/common/extensions/chrome_manifest_handlers.cc +++ b/chrome/common/extensions/chrome_manifest_handlers.cc @@ -38,7 +38,6 @@ #include "chrome/common/extensions/manifest_handlers/requirements_handler.h" #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h" #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_handlers/theme_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/extensions/mime_types_handler.h" @@ -46,6 +45,7 @@ #include "chrome/common/extensions/webview_handler.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" namespace extensions { diff --git a/chrome/common/pepper_permission_util.cc b/chrome/common/pepper_permission_util.cc index 0c9a10deef1d5f..92cf4d44da769c 100644 --- a/chrome/common/pepper_permission_util.cc +++ b/chrome/common/pepper_permission_util.cc @@ -11,9 +11,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" using extensions::Extension; using extensions::Manifest; diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index a06d5d432a3f9a..35e31587e4dd2e 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -26,7 +26,7 @@ include_rules = [ specific_include_rules = { ".*test\.cc": [ # Temporarily allowed testing includes. See above. - # TODO(jamescook): Remove these. http://crbug.com/159366 + # TODO(jamescook): Remove these. http://crbug.com/162530 "+chrome/browser/extensions/extension_service_unittest.h", "+chrome/browser/extensions/test_extension_system.h", "+chrome/common/chrome_paths.h", diff --git a/chrome/browser/extensions/external_provider_interface.h b/extensions/browser/external_provider_interface.h similarity index 92% rename from chrome/browser/extensions/external_provider_interface.h rename to extensions/browser/external_provider_interface.h index d839a63179d472..5c96773f7e282b 100644 --- a/chrome/browser/extensions/external_provider_interface.h +++ b/extensions/browser/external_provider_interface.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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_EXTERNAL_PROVIDER_INTERFACE_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTERNAL_PROVIDER_INTERFACE_H_ +#ifndef EXTENSIONS_BROWSER_EXTERNAL_PROVIDER_INTERFACE_H_ +#define EXTENSIONS_BROWSER_EXTERNAL_PROVIDER_INTERFACE_H_ #include @@ -95,4 +95,4 @@ typedef std::vector > } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_EXTERNAL_PROVIDER_INTERFACE_H_ +#endif // EXTENSIONS_BROWSER_EXTERNAL_PROVIDER_INTERFACE_H_ diff --git a/chrome/browser/extensions/management_policy.cc b/extensions/browser/management_policy.cc similarity index 96% rename from chrome/browser/extensions/management_policy.cc rename to extensions/browser/management_policy.cc index 2d169cb181c1aa..8bab962fb4e935 100644 --- a/chrome/browser/extensions/management_policy.cc +++ b/extensions/browser/management_policy.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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/management_policy.h" +#include "extensions/browser/management_policy.h" namespace extensions { diff --git a/chrome/browser/extensions/management_policy.h b/extensions/browser/management_policy.h similarity index 96% rename from chrome/browser/extensions/management_policy.h rename to extensions/browser/management_policy.h index 1aafc41ebd9ee6..ab3c9c31295c1c 100644 --- a/chrome/browser/extensions/management_policy.h +++ b/extensions/browser/management_policy.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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_MANAGEMENT_POLICY_H_ -#define CHROME_BROWSER_EXTENSIONS_MANAGEMENT_POLICY_H_ +#ifndef EXTENSIONS_BROWSER_MANAGEMENT_POLICY_H_ +#define EXTENSIONS_BROWSER_MANAGEMENT_POLICY_H_ #include #include @@ -138,4 +138,4 @@ class ManagementPolicy { } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_MANAGEMENT_POLICY_H_ +#endif // EXTENSIONS_BROWSER_MANAGEMENT_POLICY_H_ diff --git a/chrome/browser/extensions/management_policy_unittest.cc b/extensions/browser/management_policy_unittest.cc similarity index 97% rename from chrome/browser/extensions/management_policy_unittest.cc rename to extensions/browser/management_policy_unittest.cc index 0ac3f4b0c15fcb..595ba29133d27e 100644 --- a/chrome/browser/extensions/management_policy_unittest.cc +++ b/extensions/browser/management_policy_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "base/strings/utf_string_conversions.h" -#include "chrome/browser/extensions/management_policy.h" -#include "chrome/browser/extensions/test_management_policy.h" +#include "extensions/browser/management_policy.h" +#include "extensions/browser/test_management_policy.h" #include "testing/gtest/include/gtest/gtest.h" typedef extensions::TestManagementPolicyProvider TestProvider; diff --git a/chrome/browser/extensions/test_management_policy.cc b/extensions/browser/test_management_policy.cc similarity index 94% rename from chrome/browser/extensions/test_management_policy.cc rename to extensions/browser/test_management_policy.cc index c1c69ac856bc64..a2c5404dd40544 100644 --- a/chrome/browser/extensions/test_management_policy.cc +++ b/extensions/browser/test_management_policy.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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/test_management_policy.h" +#include "extensions/browser/test_management_policy.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/extensions/test_management_policy.h b/extensions/browser/test_management_policy.h similarity index 85% rename from chrome/browser/extensions/test_management_policy.h rename to extensions/browser/test_management_policy.h index 00dc98bf422ed1..f59e015890c028 100644 --- a/chrome/browser/extensions/test_management_policy.h +++ b/extensions/browser/test_management_policy.h @@ -1,15 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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_TEST_MANAGEMENT_POLICY_H_ -#define CHROME_BROWSER_EXTENSIONS_TEST_MANAGEMENT_POLICY_H_ +#ifndef EXTENSIONS_BROWSER_TEST_MANAGEMENT_POLICY_H_ +#define EXTENSIONS_BROWSER_TEST_MANAGEMENT_POLICY_H_ #include #include "base/strings/string16.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/management_policy.h" +#include "extensions/browser/management_policy.h" namespace extensions { @@ -62,4 +62,4 @@ class TestManagementPolicyProvider : public ManagementPolicy::Provider { } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_TEST_MANAGEMENT_POLICY_H_ +#endif // EXTENSIONS_BROWSER_TEST_MANAGEMENT_POLICY_H_ diff --git a/extensions/common/DEPS b/extensions/common/DEPS index 6a9adcee6ae481..01823a91f177e9 100644 --- a/extensions/common/DEPS +++ b/extensions/common/DEPS @@ -16,3 +16,11 @@ include_rules = [ # TODO(jamescook): Extract extensions-related strings from this file. "+grit/generated_resources.h", ] + +specific_include_rules = { + ".*test\.cc": [ + # Temporarily allowed testing includes. See above. + # TODO(benwells): Remove these. http://crbug.com/162530 + "+chrome/common/extensions/manifest_tests/extension_manifest_test.h", + ] +} diff --git a/chrome/common/extensions/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc similarity index 98% rename from chrome/common/extensions/manifest_handlers/shared_module_info.cc rename to extensions/common/manifest_handlers/shared_module_info.cc index a7c8164de11e8c..09df879b739cc6 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_info.cc +++ b/extensions/common/manifest_handlers/shared_module_info.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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/common/extensions/manifest_handlers/shared_module_info.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/manifest_handlers/shared_module_info.h b/extensions/common/manifest_handlers/shared_module_info.h similarity index 87% rename from chrome/common/extensions/manifest_handlers/shared_module_info.h rename to extensions/common/manifest_handlers/shared_module_info.h index ba36e3be9cfea1..db51594b07e208 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_info.h +++ b/extensions/common/manifest_handlers/shared_module_info.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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_COMMON_EXTENSIONS_MANIFEST_HANDLERS_SHARED_MODULE_INFO_H_ -#define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_SHARED_MODULE_INFO_H_ +#ifndef EXTENSIONS_COMMON_MANIFEST_HANDLERS_SHARED_MODULE_INFO_H_ +#define EXTENSIONS_COMMON_MANIFEST_HANDLERS_SHARED_MODULE_INFO_H_ #include #include @@ -68,4 +68,4 @@ class SharedModuleHandler : public ManifestHandler { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_SHARED_MODULE_INFO_H_ +#endif // EXTENSIONS_COMMON_MANIFEST_HANDLERS_SHARED_MODULE_INFO_H_ diff --git a/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc b/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc similarity index 96% rename from chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc rename to extensions/common/manifest_handlers/shared_module_manifest_unittest.cc index d30c0b7b30cd67..fa1e387e11b4a2 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc +++ b/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "base/version.h" -#include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "extensions/common/extension.h" +#include "extensions/common/manifest_handlers/shared_module_info.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -19,7 +19,7 @@ const char* kImportId1 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; const char* kImportId2 = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; const char* kNoImport = "cccccccccccccccccccccccccccccccc"; -} +} // namespace namespace extensions { diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 16d290a5ec0794..02ccf4962de83a 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -71,6 +71,8 @@ 'common/manifest_handlers/background_info.h', 'common/manifest_handlers/incognito_info.cc', 'common/manifest_handlers/incognito_info.h', + 'common/manifest_handlers/shared_module_info.cc', + 'common/manifest_handlers/shared_module_info.h', 'common/matcher/regex_set_matcher.cc', 'common/matcher/regex_set_matcher.h', 'common/matcher/string_pattern.cc', @@ -168,6 +170,7 @@ 'browser/extension_function.h', 'browser/extensions_browser_client.cc', 'browser/extensions_browser_client.h', + 'browser/external_provider_interface.h', 'browser/info_map.cc', 'browser/info_map.h', 'browser/file_highlighter.cc', @@ -176,6 +179,8 @@ 'browser/file_reader.h', 'browser/lazy_background_task_queue.cc', 'browser/lazy_background_task_queue.h', + 'browser/management_policy.cc', + 'browser/management_policy.h', 'browser/pref_names.cc', 'browser/pref_names.h', 'browser/process_manager.cc',