Moving ContentSettingsPattern and ContentSettingsPatternParser from chrome/browser/content_settings to chrome/common.

This is needed for transmitting image-related content settings to the renderer.

BUG=81179
TEST=NONE

Review URL: http://codereview.chromium.org/7885006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102088 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 35 insertions, 35 deletions

diff --git a/chrome/browser/content_settings/content_settings_details.h b/chrome/browser/content_settings/content_settings_details.h
index 53b0b50..3b46ad3 100644
--- a/chrome/browser/content_settings/content_settings_details.h
+++ b/chrome/browser/content_settings/content_settings_details.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 
 // Details for the CONTENT_SETTINGS_CHANGED notification. This is sent when
 // content settings change for at least one host. If settings change for more
diff --git a/chrome/browser/content_settings/content_settings_observer.h b/chrome/browser/content_settings/content_settings_observer.h
index 76b06a7..e26fa27 100644
--- a/chrome/browser/content_settings/content_settings_observer.h
+++ b/chrome/browser/content_settings/content_settings_observer.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/content_settings_types.h"
 
 namespace content_settings {
diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h
index 92be692..c1c28a7 100644
--- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h
+++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h
@@ -11,7 +11,7 @@
 
 #include "base/tuple.h"
 #include "base/memory/linked_ptr.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/content_settings_types.h"
 
 class GURL;
diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc
index 0b09eca..57a7845 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc
@@ -9,12 +9,12 @@
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index 8df4672..596b52c 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -13,7 +13,6 @@
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -21,6 +20,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/user_metrics.h"
diff --git a/chrome/browser/content_settings/content_settings_provider.h b/chrome/browser/content_settings/content_settings_provider.h
index 57f43e8..466c9cd 100644
--- a/chrome/browser/content_settings/content_settings_provider.h
+++ b/chrome/browser/content_settings/content_settings_provider.h
@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "base/values.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 
 class GURL;
 
diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h
index e357875..30efa47 100644
--- a/chrome/browser/content_settings/content_settings_utils.h
+++ b/chrome/browser/content_settings/content_settings_utils.h
@@ -10,8 +10,8 @@
 
 #include "base/logging.h"
 #include "base/values.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/content_settings_types.h"
 
 namespace content_settings {
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index a98e594..3a9724b 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -17,12 +17,12 @@
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
-#include "base/values.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_observer.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
diff --git a/chrome/browser/extensions/extension_content_settings_helpers.h b/chrome/browser/extensions/extension_content_settings_helpers.h
index b3e4ce7..abad710 100644
--- a/chrome/browser/extensions/extension_content_settings_helpers.h
+++ b/chrome/browser/extensions/extension_content_settings_helpers.h
@@ -8,8 +8,8 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 
 namespace extension_content_settings_helpers {
 
diff --git a/chrome/browser/extensions/extension_content_settings_store.h b/chrome/browser/extensions/extension_content_settings_store.h
index f9a7765..ba6fa1a 100644
--- a/chrome/browser/extensions/extension_content_settings_store.h
+++ b/chrome/browser/extensions/extension_content_settings_store.h
@@ -14,10 +14,10 @@
 #include "base/threading/thread_checker.h"
 #include "base/time.h"
 #include "base/tuple.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/extensions/extension_prefs_scope.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "googleurl/src/gurl.h"
 
 namespace base {
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 4376a82..d13da5a 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -5,10 +5,9 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/dom_operation_notification_details.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h"
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index 89e7d38..7b2ae50 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -8,7 +8,6 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_child_process_host.h"
diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc
index 943672b..f147af5 100644
--- a/chrome/browser/notifications/notification_exceptions_table_model.cc
+++ b/chrome/browser/notifications/notification_exceptions_table_model.cc
@@ -9,10 +9,10 @@
 
 #include "base/auto_reset.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 62a7806..5ff467b 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -14,7 +14,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4914755..328ae5e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -813,10 +813,6 @@
         'browser/content_settings/content_settings_observer.h',
         'browser/content_settings/content_settings_origin_identifier_value_map.cc',
         'browser/content_settings/content_settings_origin_identifier_value_map.h',
-        'browser/content_settings/content_settings_pattern.cc',
-        'browser/content_settings/content_settings_pattern.h',
-        'browser/content_settings/content_settings_pattern_parser.cc',
-        'browser/content_settings/content_settings_pattern_parser.h',
         'browser/content_settings/content_settings_policy_provider.cc',
         'browser/content_settings/content_settings_policy_provider.h',
         'browser/content_settings/content_settings_pref_provider.cc',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 153ee38..cb39d95 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -89,6 +89,10 @@
         'common/content_settings.h',
         'common/content_settings_helper.cc',
         'common/content_settings_helper.h',
+        'common/content_settings_pattern.cc',
+        'common/content_settings_pattern.h',
+        'common/content_settings_pattern_parser.cc',
+        'common/content_settings_pattern_parser.h',
         'common/content_settings_types.h',
         'common/custom_handlers/protocol_handler.cc',
         'common/custom_handlers/protocol_handler.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 25dbb12..33c37c6 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1207,8 +1207,6 @@
         'browser/content_settings/content_settings_mock_provider.cc',
         'browser/content_settings/content_settings_mock_provider.h',
         'browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc',
-        'browser/content_settings/content_settings_pattern_unittest.cc',
-        'browser/content_settings/content_settings_pattern_parser_unittest.cc',
         'browser/content_settings/content_settings_policy_provider_unittest.cc',
         'browser/content_settings/content_settings_pref_provider_unittest.cc',
         'browser/content_settings/content_settings_provider_unittest.cc',
@@ -1760,6 +1758,8 @@
         'common/chrome_paths_unittest.cc',
         'common/common_param_traits_unittest.cc',
         'common/content_settings_helper_unittest.cc',
+        'common/content_settings_pattern_parser_unittest.cc',
+        'common/content_settings_pattern_unittest.cc',
         'common/extensions/extension_action_unittest.cc',
         'common/extensions/extension_file_util_unittest.cc',
         'common/extensions/extension_icon_set_unittest.cc',
diff --git a/chrome/browser/content_settings/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc
index 1d7db36..b15f732 100644
--- a/chrome/browser/content_settings/content_settings_pattern.cc
+++ b/chrome/common/content_settings_pattern.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "chrome/common/content_settings_pattern.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "chrome/browser/content_settings/content_settings_pattern_parser.h"
+#include "chrome/common/content_settings_pattern_parser.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/dns_util.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/content_settings/content_settings_pattern.h b/chrome/common/content_settings_pattern.h
index 232b96b..7838141 100644
--- a/chrome/browser/content_settings/content_settings_pattern.h
+++ b/chrome/common/content_settings_pattern.h
@@ -4,8 +4,8 @@
 
 // Patterns used in content setting rules.
 
-#ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_H_
+#ifndef CHROME_COMMON_CONTENT_SETTINGS_PATTERN_H_
+#define CHROME_COMMON_CONTENT_SETTINGS_PATTERN_H_
 #pragma once
 
 #include <ostream>
@@ -254,4 +254,4 @@ inline std::ostream& operator<<(
   return out << pattern.ToString();
 }
 
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_H_
+#endif  // CHROME_COMMON_CONTENT_SETTINGS_PATTERN_H_
diff --git a/chrome/browser/content_settings/content_settings_pattern_parser.cc b/chrome/common/content_settings_pattern_parser.cc
index 39e3091..437ecb1 100644
--- a/chrome/browser/content_settings/content_settings_pattern_parser.cc
+++ b/chrome/common/content_settings_pattern_parser.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/browser/content_settings/content_settings_pattern_parser.h"
+#include "chrome/common/content_settings_pattern_parser.h"
 
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/content_settings/content_settings_pattern_parser.h b/chrome/common/content_settings_pattern_parser.h
index eca4568..3638c5d 100644
--- a/chrome/browser/content_settings/content_settings_pattern_parser.h
+++ b/chrome/common/content_settings_pattern_parser.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_PARSER_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_PARSER_H_
+#ifndef CHROME_COMMON_CONTENT_SETTINGS_PATTERN_PARSER_H_
+#define CHROME_COMMON_CONTENT_SETTINGS_PATTERN_PARSER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "chrome/common/content_settings_pattern.h"
 
 namespace content_settings {
 
@@ -38,4 +38,4 @@ class PatternParser {
 
 }  // namespace content_settings
 
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_PARSER_H_
+#endif  // CHROME_COMMON_CONTENT_SETTINGS_PATTERN_PARSER_H_
diff --git a/chrome/browser/content_settings/content_settings_pattern_parser_unittest.cc b/chrome/common/content_settings_pattern_parser_unittest.cc
index 8a8aeca..ed32f59 100644
--- a/chrome/browser/content_settings/content_settings_pattern_parser_unittest.cc
+++ b/chrome/common/content_settings_pattern_parser_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/content_settings/content_settings_pattern.h"
-#include "chrome/browser/content_settings/content_settings_pattern_parser.h"
+#include "chrome/common/content_settings_pattern.h"
+#include "chrome/common/content_settings_pattern_parser.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/content_settings/content_settings_pattern_unittest.cc b/chrome/common/content_settings_pattern_unittest.cc
index cb61a61..8bad3ea 100644
--- a/chrome/browser/content_settings/content_settings_pattern_unittest.cc
+++ b/chrome/common/content_settings_pattern_unittest.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/browser/content_settings/content_settings_pattern.h"
+#include "chrome/common/content_settings_pattern.h"
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"