diff options
72 files changed, 115 insertions, 72 deletions
@@ -727,7 +727,8 @@ 'filepath': 'chrome/browser/content_settings/'\ '|chrome/browser/ui/views/website_settings/'\ '|chrome/browser/ui/website_settings/'\ - '|chrome/common/content_settings', + '|chrome/common/content_settings'\ + '|components/content_settings/', }, 'windows_sandboxing': { 'filepath': 'sandbox/win/', diff --git a/chrome/DEPS b/chrome/DEPS index cb964dd..01b8b63 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -16,6 +16,7 @@ include_rules = [ "-chrome", "+chrome/common", "+chrome/test", + "+components/content_settings/core/common", "+components/url_fixer", "+components/variations", "+content/public/common", diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h index cae3d7d..db89183 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.h +++ b/chrome/browser/browsing_data/cookies_tree_model.h @@ -25,7 +25,7 @@ #include "chrome/browser/browsing_data/browsing_data_quota_helper.h" #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h" #include "chrome/browser/browsing_data/local_data_container.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "net/ssl/channel_id_store.h" #include "ui/base/models/tree_node_model.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 7418ac3..a4b7252 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -81,7 +81,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/env_vars.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pepper_permission_util.h" @@ -93,6 +92,7 @@ #include "chromeos/chromeos_constants.h" #include "components/cdm/browser/cdm_message_filter_android.h" #include "components/cloud_devices/common/cloud_devices_switches.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/dom_distiller/core/url_constants.h" #include "components/google/core/browser/google_util.h" #include "components/metrics/client_info.h" diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index 517be45..641c3b7 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -16,8 +16,8 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/content_settings/content_settings_details.h b/chrome/browser/content_settings/content_settings_details.h index f47ea30..9677560 100644 --- a/chrome/browser/content_settings/content_settings_details.h +++ b/chrome/browser/content_settings/content_settings_details.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc index 4a3888a..57da3d9 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc @@ -7,8 +7,8 @@ #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/chrome_content_client.h" -#include "chrome/common/content_settings.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.h b/chrome/browser/content_settings/content_settings_internal_extension_provider.h index cb97bd6..2078f4e 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.h +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.h @@ -9,7 +9,7 @@ #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index e880ae6..0046dd3 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -20,8 +20,8 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/content_settings/content_settings_usages_state.h b/chrome/browser/content_settings/content_settings_usages_state.h index 01749d9..ff72167 100644 --- a/chrome/browser/content_settings/content_settings_usages_state.h +++ b/chrome/browser/content_settings/content_settings_usages_state.h @@ -8,7 +8,7 @@ #include <map> #include <set> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "url/gurl.h" diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h index af7c3c5..3f62cf6 100644 --- a/chrome/browser/content_settings/content_settings_utils.h +++ b/chrome/browser/content_settings/content_settings_utils.h @@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/content_settings/cookie_settings.h b/chrome/browser/content_settings/cookie_settings.h index 44902e6..ed8edba 100644 --- a/chrome/browser/content_settings/cookie_settings.h +++ b/chrome/browser/content_settings/cookie_settings.h @@ -13,7 +13,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/keyed_service/content/refcounted_browser_context_keyed_service.h" #include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index b5939b5..1b05880 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -19,7 +19,7 @@ #include "base/threading/platform_thread.h" #include "base/tuple.h" #include "chrome/browser/content_settings/content_settings_observer.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/content_settings/permission_context_base_unittest.cc b/chrome/browser/content_settings/permission_context_base_unittest.cc index 22ce437..29fd316a 100644 --- a/chrome/browser/content_settings/permission_context_base_unittest.cc +++ b/chrome/browser/content_settings/permission_context_base_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" -#include "chrome/common/content_settings.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" diff --git a/chrome/browser/content_settings/permission_queue_controller.cc b/chrome/browser/content_settings/permission_queue_controller.cc index c32e9d9..191e085 100644 --- a/chrome/browser/content_settings/permission_queue_controller.cc +++ b/chrome/browser/content_settings/permission_queue_controller.cc @@ -15,8 +15,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h index 8a338ce..b3b8d2d 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.h +++ b/chrome/browser/content_settings/tab_specific_content_settings.h @@ -16,8 +16,8 @@ #include "chrome/browser/content_settings/content_settings_usages_state.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/media/media_stream_devices_controller.h" -#include "chrome/common/content_settings.h" #include "chrome/common/custom_handlers/protocol_handler.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/download/download_request_limiter.h b/chrome/browser/download/download_request_limiter.h index c0ed0ed..2b4e790 100644 --- a/chrome/browser/download/download_request_limiter.h +++ b/chrome/browser/download/download_request_limiter.h @@ -13,7 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.h b/chrome/browser/extensions/api/content_settings/content_settings_helpers.h index d94e0d8..db82fe4 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.h b/chrome/browser/extensions/api/content_settings/content_settings_store.h index 9112591..44149ae 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_store.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_store.h @@ -15,7 +15,7 @@ #include "base/time/time.h" #include "base/tuple.h" #include "chrome/browser/content_settings/content_settings_provider.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "extensions/browser/extension_prefs_scope.h" diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 20fbf48..c0e5be9 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -11,9 +11,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/url_constants.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index c85500d..06a5d33 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -6,8 +6,8 @@ #include "base/values.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" -#include "chrome/common/content_settings.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc index 7a15c14..cbb9047 100644 --- a/chrome/browser/media/media_stream_devices_controller.cc +++ b/chrome/browser/media/media_stream_devices_controller.cc @@ -17,9 +17,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index 8af3c74..4771d88 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -15,8 +15,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/browser_thread.h" #include "net/ssl/ssl_cipher_suite_names.h" #include "net/ssl/ssl_config_service.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc index 94ca963..4e90ce6 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/prefs/pref_service_mock_factory.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/test/test_browser_thread.h" #include "net/ssl/ssl_config_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/notifications/desktop_notification_profile_util.h b/chrome/browser/notifications/desktop_notification_profile_util.h index 97a72b7..988d11e 100644 --- a/chrome/browser/notifications/desktop_notification_profile_util.h +++ b/chrome/browser/notifications/desktop_notification_profile_util.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_PROFILE_UTIL_H_ #include "base/macros.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" class Profile; diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index 24e3dd6..ca71f57 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -20,7 +20,7 @@ #include "chrome/browser/content_settings/content_settings_provider.h" #include "chrome/browser/content_settings/permission_context_base.h" #include "chrome/browser/notifications/extension_welcome_notification.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/extension_registry_observer.h" #include "third_party/WebKit/public/platform/WebNotificationPermission.h" diff --git a/chrome/browser/notifications/message_center_settings_controller.h b/chrome/browser/notifications/message_center_settings_controller.h index a4abb49..92effbd 100644 --- a/chrome/browser/notifications/message_center_settings_controller.h +++ b/chrome/browser/notifications/message_center_settings_controller.h @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/extensions/app_icon_loader.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/favicon_base/favicon_types.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index 8494e49..f189fea 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -26,9 +26,9 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/content_settings.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index e6f9415..090a5df 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -16,9 +16,9 @@ #include "chrome/browser/plugins/plugin_metadata.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/plugin_service_filter.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index bcedfc3..cc577c6 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -13,7 +13,7 @@ #include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/browser_message_filter.h" struct ChromeViewHostMsg_GetPluginInfo_Output; diff --git a/chrome/browser/policy/javascript_policy_handler.cc b/chrome/browser/policy/javascript_policy_handler.cc index 1bee66d..69aa106 100644 --- a/chrome/browser/policy/javascript_policy_handler.cc +++ b/chrome/browser/policy/javascript_policy_handler.cc @@ -6,8 +6,8 @@ #include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/components_strings.h" diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc index c9d8477..ba76238 100644 --- a/chrome/browser/policy/javascript_policy_handler_unittest.cc +++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/policy/javascript_policy_handler.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" #include "components/policy/core/browser/policy_error_map.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index aa51831..0cd7050 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -72,7 +72,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -80,6 +79,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/infobars/core/infobar.h" #include "components/policy/core/browser/browser_policy_connector.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc index 56afba3..876e2f2 100644 --- a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc @@ -8,7 +8,7 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index d11886e..db36074 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -30,11 +30,11 @@ #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc index 9c3a3d6..73efc8c 100644 --- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc +++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc @@ -9,8 +9,8 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" -#include "chrome/common/content_settings.h" #include "chrome/grit/generated_resources.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "grit/theme_resources.h" @@ -111,4 +111,3 @@ bool PopupBlockedInfoBarDelegate::Accept() { return true; } - diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 342fbf4..9a1cbed 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -30,7 +30,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/ui/zoom/zoom_observer.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/sessions/session_id.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/cocoa/website_settings/permission_selector_button.h b/chrome/browser/ui/cocoa/website_settings/permission_selector_button.h index 056a92f..d7c08f1 100644 --- a/chrome/browser/ui/cocoa/website_settings/permission_selector_button.h +++ b/chrome/browser/ui/cocoa/website_settings/permission_selector_button.h @@ -10,7 +10,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/website_settings/permission_menu_model.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" @class MenuController; diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index d0bc409..102ddb6 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -23,10 +23,10 @@ #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h" #include "chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/grit/generated_resources.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h index d4740d1..4d1573d 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h @@ -12,8 +12,8 @@ #include "base/compiler_specific.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/common/content_settings.h" #include "chrome/common/custom_handlers/protocol_handler.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/common/media_stream_request.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index dc9a767..e610488 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/grit/generated_resources.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/infobars/core/infobar_delegate.h" #include "content/public/browser/web_contents.h" #include "content/public/test/web_contents_tester.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.h b/chrome/browser/ui/fullscreen/fullscreen_controller.h index f9fff19..bbb4f8d 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller.h +++ b/chrome/browser/ui/fullscreen/fullscreen_controller.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/views/collected_cookies_views.h b/chrome/browser/ui/views/collected_cookies_views.h index 87a597c..07602b5 100644 --- a/chrome/browser/ui/views/collected_cookies_views.h +++ b/chrome/browser/ui/views/collected_cookies_views.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_COLLECTED_COOKIES_VIEWS_H_ #include "base/compiler_specific.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/views/controls/button/button.h" diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h index 9ae19995..8199e30 100644 --- a/chrome/browser/ui/views/website_settings/permission_selector_view.h +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h" #include "chrome/browser/ui/website_settings/permission_menu_model.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "ui/views/controls/button/menu_button_listener.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/website_settings/permission_menu_model.h b/chrome/browser/ui/website_settings/permission_menu_model.h index 9f9a308..5ea18d8 100644 --- a/chrome/browser/ui/website_settings/permission_menu_model.h +++ b/chrome/browser/ui/website_settings/permission_menu_model.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_MENU_MODEL_H_ #include "chrome/browser/ui/website_settings/website_settings_ui.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "ui/base/models/simple_menu_model.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc b/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc index cc2860f..8b6dfa0 100644 --- a/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc +++ b/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/website_settings/permission_menu_model.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/website_settings/website_settings.h b/chrome/browser/ui/website_settings/website_settings.h index 52e58bb..c071a6d 100644 --- a/chrome/browser/ui/website_settings/website_settings.h +++ b/chrome/browser/ui/website_settings/website_settings.h @@ -11,7 +11,7 @@ #include "base/time/time.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/history/history_service.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/common/signed_certificate_timestamp_id_and_status.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/website_settings/website_settings_ui.h b/chrome/browser/ui/website_settings/website_settings_ui.h index 8a432dd..314b20a 100644 --- a/chrome/browser/ui/website_settings/website_settings_ui.h +++ b/chrome/browser/ui/website_settings/website_settings_ui.h @@ -10,7 +10,7 @@ #include "base/strings/string16.h" #include "chrome/browser/ui/website_settings/website_settings.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/common/signed_certificate_timestamp_id_and_status.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index aabd9ee..c45e977 100644 --- a/chrome/browser/ui/website_settings/website_settings_unittest.cc +++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc @@ -14,9 +14,9 @@ #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h" -#include "chrome/common/content_settings.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/cert_store.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 265318a..99576d3 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -28,12 +28,12 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/google/core/browser/google_util.h" #include "components/user_prefs/user_prefs.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index 5a082e0..aa44176 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h @@ -14,7 +14,7 @@ #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h index 62cef00..7d4b361 100644 --- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h +++ b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h @@ -7,7 +7,7 @@ #include <vector> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "ppapi/c/private/ppp_flash_browser_operations.h" #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 1459cf2..1b8d20f 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -46,8 +46,6 @@ 'common/common_param_traits.h', 'common/common_param_traits_macros.h', 'common/content_restriction.h', - 'common/content_settings.cc', - 'common/content_settings.h', 'common/content_settings_pattern_serializer.cc', 'common/content_settings_pattern_serializer.h', 'common/crash_keys.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 53c4a28..c194429 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1787,8 +1787,6 @@ 'common/chrome_paths_unittest.cc', 'common/chrome_content_client_unittest.cc', 'common/cloud_print/cloud_print_helpers_unittest.cc', - 'common/content_settings_pattern_parser_unittest.cc', - 'common/content_settings_pattern_unittest.cc', 'common/crash_keys_unittest.cc', 'common/extensions/api/commands/commands_manifest_unittest.cc', 'common/extensions/api/extension_action/browser_action_manifest_unittest.cc', diff --git a/chrome/common/common_param_traits_macros.h b/chrome/common/common_param_traits_macros.h index b4a0059..6a57d08 100644 --- a/chrome/common/common_param_traits_macros.h +++ b/chrome/common/common_param_traits_macros.h @@ -8,7 +8,7 @@ #ifndef CHROME_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ #define CHROME_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "ipc/ipc_message_macros.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index a492642..1b085c9 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -17,11 +17,11 @@ #include "base/values.h" #include "build/build_config.h" #include "chrome/common/common_param_traits.h" -#include "chrome/common/content_settings.h" #include "chrome/common/instant_types.h" #include "chrome/common/ntp_logging_events.h" #include "chrome/common/omnibox_focus_state.h" #include "chrome/common/search_provider.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/nacl/common/nacl_types.h" diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h index 7035135..91a1646 100644 --- a/chrome/renderer/chrome_render_process_observer.h +++ b/chrome/renderer/chrome_render_process_observer.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/renderer/render_process_observer.h" class ChromeContentRendererClient; diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h index 8b08ba8..521710b 100644 --- a/chrome/renderer/content_settings_observer.h +++ b/chrome/renderer/content_settings_observer.h @@ -8,7 +8,7 @@ #include <map> #include <set> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc index 5bbed1f..a202cf0 100644 --- a/chrome/renderer/content_settings_observer_browsertest.cc +++ b/chrome/renderer/content_settings_observer_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/content_settings_observer.h" #include "chrome/test/base/chrome_render_view_test.h" diff --git a/components/BUILD.gn b/components/BUILD.gn index 05f7e97..6383b23 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -207,6 +207,7 @@ test("components_unittests") { "//components/captive_portal:unit_tests", "//components/cloud_devices/common:unit_tests", "//components/component_updater:unit_tests", + "//components/content_settings/core/common:unit_tests", "//components/crx_file:unit_tests", "//components/data_reduction_proxy/browser:unit_tests", "//components/data_reduction_proxy/common:unit_tests", diff --git a/components/OWNERS b/components/OWNERS index f375616..c9663cd 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -13,6 +13,10 @@ per-file bookmarks.gypi=sky@chromium.org per-file cloud_devices*=gene@chromium.org per-file cloud_devices*=vitalybuka@chromium.org +per-file content_settings*=markusheintz@chromium.org +per-file content_settings*=bauerb@chromium.org +per-file content_settings*=jochen@chromium.org + per-file copresence.gypi=rkc@chromium.org per-file copresence.gypi=ckehoe@chromium.org per-file copresence.gypi=xiyuan@chromium.org diff --git a/components/components_tests.gyp b/components/components_tests.gyp index b8af781..e7f99ef 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -81,6 +81,8 @@ 'component_updater/test/crx_downloader_unittest.cc', 'component_updater/test/update_checker_unittest.cc', 'component_updater/test/update_response_unittest.cc', + 'content_settings/core/common/content_settings_pattern_parser_unittest.cc', + 'content_settings/core/common/content_settings_pattern_unittest.cc', 'crx_file/id_util_unittest.cc', 'data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc', 'data_reduction_proxy/browser/data_reduction_proxy_config_service_unittest.cc', @@ -297,6 +299,9 @@ 'components.gyp:component_updater_test_support', '../third_party/libxml/libxml.gyp:libxml', + # Dependencies of content_settings + 'components.gyp:content_settings_core_common', + # Dependencies of crash 'components.gyp:crash_test_support', @@ -498,6 +503,7 @@ ['include', '^bookmarks/'], ['include', '^component_updater/'], ['include', '^crash/'], + ['include', '^content_settings/'], ['include', '^data_reduction_proxy/'], ['include', '^dom_distiller/'], ['include', '^enhanced_bookmarks/'], diff --git a/components/content_settings.gypi b/components/content_settings.gypi index b24ee34..94eb5f3a 100644 --- a/components/content_settings.gypi +++ b/components/content_settings.gypi @@ -19,6 +19,8 @@ ], 'sources': [ # Note: sources list duplicated in GN build. + 'content_settings/core/common/content_settings.cc', + 'content_settings/core/common/content_settings.h', 'content_settings/core/common/content_settings_pattern.cc', 'content_settings/core/common/content_settings_pattern.h', 'content_settings/core/common/content_settings_pattern_parser.cc', diff --git a/components/content_settings/core/common/BUILD.gn b/components/content_settings/core/common/BUILD.gn index 6dfa0bb..6d3d02c 100644 --- a/components/content_settings/core/common/BUILD.gn +++ b/components/content_settings/core/common/BUILD.gn @@ -2,12 +2,34 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("common") { +static_library("common") { sources = [ + "content_settings.cc", + "content_settings.h", "content_settings_pattern.cc", "content_settings_pattern.h", "content_settings_pattern_parser.cc", "content_settings_pattern_parser.h", "content_settings_types.h", ] + + deps = [ + "//base", + "//net", + "//url", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "content_settings_pattern_unittest.cc", + "content_settings_pattern_parser_unittest.cc", + ] + + deps = [ + ":common", + "//testing/gmock", + "//testing/gtest", + ] } diff --git a/components/content_settings/core/common/DEPS b/components/content_settings/core/common/DEPS index 6a2f02e..201d8c8 100644 --- a/components/content_settings/core/common/DEPS +++ b/components/content_settings/core/common/DEPS @@ -1,3 +1,5 @@ include_rules = [ "+net/base", + "+testing", + "+url", ] diff --git a/chrome/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc index 5d48bc9..6bfbadb 100644 --- a/chrome/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" ContentSetting IntToContentSetting(int content_setting) { return ((content_setting < 0) || diff --git a/chrome/common/content_settings.h b/components/content_settings/core/common/content_settings.h index 7ab2ca1..f35e9e1 100644 --- a/chrome/common/content_settings.h +++ b/components/content_settings/core/common/content_settings.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_CONTENT_SETTINGS_H_ -#define CHROME_COMMON_CONTENT_SETTINGS_H_ +#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ +#define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ #include <string> #include <vector> @@ -73,4 +73,4 @@ struct SettingInfo { } // namespace content_settings -#endif // CHROME_COMMON_CONTENT_SETTINGS_H_ +#endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ diff --git a/chrome/common/content_settings_pattern_parser_unittest.cc b/components/content_settings/core/common/content_settings_pattern_parser_unittest.cc index b35b700..b35b700 100644 --- a/chrome/common/content_settings_pattern_parser_unittest.cc +++ b/components/content_settings/core/common/content_settings_pattern_parser_unittest.cc diff --git a/chrome/common/content_settings_pattern_unittest.cc b/components/content_settings/core/common/content_settings_pattern_unittest.cc index 3688d84..3688d84 100644 --- a/chrome/common/content_settings_pattern_unittest.cc +++ b/components/content_settings/core/common/content_settings_pattern_unittest.cc diff --git a/components/omnibox/autocomplete_input_unittest.cc b/components/omnibox/autocomplete_input_unittest.cc index aaa4cd2..939aea8 100644 --- a/components/omnibox/autocomplete_input_unittest.cc +++ b/components/omnibox/autocomplete_input_unittest.cc @@ -13,17 +13,11 @@ #include "components/omnibox/test_scheme_classifier.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/url_parse.h" -#include "url/url_util.h" using base::ASCIIToUTF16; using metrics::OmniboxEventProto; TEST(AutocompleteInputTest, InputType) { - // TODO(mukai): Fix this scheme setup. - url::AddStandardScheme("chrome"); - url::AddStandardScheme("chrome-devtools"); - url::AddStandardScheme("chrome-search"); - struct test_data { const base::string16 input; const metrics::OmniboxInputType::Type type; diff --git a/components/test/DEPS b/components/test/DEPS index 25be319..57345fc 100644 --- a/components/test/DEPS +++ b/components/test/DEPS @@ -1,4 +1,6 @@ include_rules = [ + # To initialize the global data of content_settings. + "+components/content_settings/core/common", "+content/public/test", "+ui/base/android/ui_base_jni_registrar.h", "+ui/base/resource/resource_bundle.h", diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc index 1cee176..9664cce 100644 --- a/components/test/run_all_unittests.cc +++ b/components/test/run_all_unittests.cc @@ -8,10 +8,12 @@ #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" +#include "components/content_settings/core/common/content_settings_pattern.h" #include "content/public/test/test_content_client_initializer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "url/url_util.h" #if defined(OS_MACOSX) #include "base/mac/bundle_locations.h" @@ -83,6 +85,17 @@ class ComponentsTestSuite : public base::TestSuite { ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( resources_pack_path.AppendASCII("resources.pak"), ui::SCALE_FACTOR_NONE); + + // These schemes need to be added globally to pass tests of + // autocomplete_input_unittest.cc and content_settings_pattern* + url::AddStandardScheme("chrome"); + url::AddStandardScheme("chrome-extension"); + url::AddStandardScheme("chrome-devtools"); + url::AddStandardScheme("chrome-search"); + + // Not using kExtensionScheme to avoid the dependency to extensions. + ContentSettingsPattern::SetNonWildcardDomainNonPortScheme( + "chrome-extension"); } virtual void Shutdown() OVERRIDE { |