Move content_settings_observable_provider and content_seettings_origi…

…n_identifier_value_map BUG=384870 R=jochen@chromium.org TEST=build succeeds Review URL: https://codereview.chromium.org/584753003 Cr-Commit-Position: refs/heads/master@{#296024}
SaschaDeWaal · Sep 22, 2014 · 9afeee5 · 9afeee5
1 parent f233c99
commit 9afeee5
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 26 deletions.
diff --git a/chrome/browser/content_settings/content_settings_custom_extension_provider.h b/chrome/browser/content_settings/content_settings_custom_extension_provider.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/content_settings/content_settings_observable_provider.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
+#include "components/content_settings/core/browser/content_settings_observable_provider.h"
 
 namespace content_settings {
 

diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h
@@ -13,7 +13,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/content_settings/content_settings_observable_provider.h"
+#include "components/content_settings/core/browser/content_settings_observable_provider.h"
 
 class PrefService;
 

diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.h b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
@@ -7,8 +7,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #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 "components/content_settings/core/browser/content_settings_observable_provider.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.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_mock_provider.h b/chrome/browser/content_settings/content_settings_mock_provider.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/browser/content_settings/content_settings_observable_provider.h"
-#include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
+#include "components/content_settings/core/browser/content_settings_observable_provider.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.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_origin_identifier_value_map_unittest.cc b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_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_origin_identifier_value_map.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"

diff --git a/chrome/browser/content_settings/content_settings_policy_provider.h b/chrome/browser/content_settings/content_settings_policy_provider.h
@@ -12,8 +12,8 @@
 #include "base/basictypes.h"
 #include "base/prefs/pref_change_registrar.h"
 #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 "components/content_settings/core/browser/content_settings_observable_provider.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"
 
 class PrefService;
 

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h
@@ -12,9 +12,9 @@
 #include "base/basictypes.h"
 #include "base/prefs/pref_change_registrar.h"
 #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/browser/content_settings/content_settings_utils.h"
+#include "components/content_settings/core/browser/content_settings_observable_provider.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"
 
 class PrefService;
 

diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -14,14 +14,14 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/clock.h"
 #include "chrome/browser/content_settings/content_settings_default_provider.h"
-#include "chrome/browser/content_settings/content_settings_observable_provider.h"
 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
+#include "components/content_settings/core/browser/content_settings_observable_provider.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc
@@ -13,10 +13,10 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "content/public/browser/browser_thread.h"
 

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -281,10 +281,6 @@
       'browser/component_updater/swiftshader_component_installer.h',
       'browser/content_settings/content_settings_default_provider.cc',
       'browser/content_settings/content_settings_default_provider.h',
-      'browser/content_settings/content_settings_observable_provider.cc',
-      'browser/content_settings/content_settings_observable_provider.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_override_provider.cc',
       'browser/content_settings/content_settings_override_provider.h',
       'browser/content_settings/content_settings_policy_provider.cc',

diff --git a/components/content_settings.gypi b/components/content_settings.gypi
@@ -22,6 +22,10 @@
         'content_settings/core/browser/content_settings_details.h',
         'content_settings/core/browser/content_settings_observer.h',
         'content_settings/core/browser/content_settings_provider.h',
+        'content_settings/core/browser/content_settings_observable_provider.cc',
+        'content_settings/core/browser/content_settings_observable_provider.h',
+        'content_settings/core/browser/content_settings_origin_identifier_value_map.cc',
+        'content_settings/core/browser/content_settings_origin_identifier_value_map.h',
         'content_settings/core/browser/content_settings_rule.cc',
         'content_settings/core/browser/content_settings_rule.h',
       ],

diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
@@ -8,6 +8,10 @@ static_library("browser") {
     "content_settings_details.h",
     "content_settings_observer.h",
     "content_settings_provider.h",
+    "content_settings_observable_provider.cc",
+    "content_settings_observable_provider.h",
+    "content_settings_origin_identifier_value_map.cc",
+    "content_settings_origin_identifier_value_map.h",
     "content_settings_rule.cc",
     "content_settings_rule.h",
   ]

diff --git a/...s/content_settings_observable_provider.cc → ...r/content_settings_observable_provider.cc b/...s/content_settings_observable_provider.cc → ...r/content_settings_observable_provider.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_observable_provider.h"
+#include "components/content_settings/core/browser/content_settings_observable_provider.h"
 
 namespace content_settings {
 

diff --git a/...gs/content_settings_observable_provider.h → ...er/content_settings_observable_provider.h b/...gs/content_settings_observable_provider.h → ...er/content_settings_observable_provider.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_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OBSERVABLE_PROVIDER_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OBSERVABLE_PROVIDER_H_
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_OBSERVABLE_PROVIDER_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_OBSERVABLE_PROVIDER_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@ class ObservableProvider : public ProviderInterface {
 
 }  // namespace content_settings
 
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OBSERVABLE_PROVIDER_H_
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_OBSERVABLE_PROVIDER_H_
diff --git a/...t_settings_origin_identifier_value_map.cc → ...t_settings_origin_identifier_value_map.cc b/...t_settings_origin_identifier_value_map.cc → ...t_settings_origin_identifier_value_map.cc
@@ -2,14 +2,13 @@
 // 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_origin_identifier_value_map.h"
+#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
-#include "chrome/browser/content_settings/content_settings_utils.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "url/gurl.h"

diff --git a/...nt_settings_origin_identifier_value_map.h → ...nt_settings_origin_identifier_value_map.h b/...nt_settings_origin_identifier_value_map.h → ...nt_settings_origin_identifier_value_map.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_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_ORIGIN_IDENTIFIER_VALUE_MAP_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_ORIGIN_IDENTIFIER_VALUE_MAP_H_
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_ORIGIN_IDENTIFIER_VALUE_MAP_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_ORIGIN_IDENTIFIER_VALUE_MAP_H_
 
 #include <map>
 #include <string>
@@ -124,4 +124,4 @@ class OriginIdentifierValueMap {
 
 }  // namespace content_settings
 
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_ORIGIN_IDENTIFIER_VALUE_MAP_H_
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_ORIGIN_IDENTIFIER_VALUE_MAP_H_