Move ContentSettingsUsagesState to the component.

BUG=387064

Review URL: https://codereview.chromium.org/815643004

Cr-Commit-Position: refs/heads/master@{#311434}

chrome/browser/content_settings/content_settings_usages_state_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_usages_state.h"
+#include "components/content_settings/core/browser/content_settings_usages_state.h"
 
 #include <string>
 

chrome/browser/content_settings/tab_specific_content_settings.h

@@ -13,10 +13,10 @@
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
-#include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
+#include "components/content_settings/core/browser/content_settings_usages_state.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"

chrome/browser/geolocation/geolocation_browsertest.cc

@@ -11,7 +11,6 @@
 #include "base/test/simple_test_clock.h"
 #include "base/time/clock.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -21,6 +20,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/content_settings/core/browser/content_settings_usages_state.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"

chrome/chrome_browser.gypi

@@ -1237,8 +1237,6 @@
       'browser/content_settings/chrome_content_settings_client.h',
       'browser/content_settings/chrome_content_settings_utils.cc',
       'browser/content_settings/chrome_content_settings_utils.h',
-      'browser/content_settings/content_settings_usages_state.cc',
-      'browser/content_settings/content_settings_usages_state.h',
       'browser/content_settings/cookie_settings.cc',
       'browser/content_settings/cookie_settings.h',
       'browser/content_settings/local_shared_objects_container.cc',

components/content_settings.gypi

@@ -30,6 +30,8 @@
         'content_settings/core/browser/content_settings_observable_provider.cc',
         'content_settings/core/browser/content_settings_observable_provider.h',
         'content_settings/core/browser/content_settings_observer.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_override_provider.cc',
         'content_settings/core/browser/content_settings_override_provider.h',
         'content_settings/core/browser/content_settings_policy_provider.cc',
@@ -37,10 +39,10 @@
         'content_settings/core/browser/content_settings_pref_provider.cc',
         'content_settings/core/browser/content_settings_pref_provider.h',
         'content_settings/core/browser/content_settings_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',
+	'content_settings/core/browser/content_settings_usages_state.cc',
+	'content_settings/core/browser/content_settings_usages_state.h',
         'content_settings/core/browser/content_settings_utils.cc',
         'content_settings/core/browser/content_settings_utils.h',
         'content_settings/core/browser/host_content_settings_map.cc',

components/content_settings/core/browser/BUILD.gn

@@ -23,6 +23,8 @@ static_library("browser") {
     "content_settings_origin_identifier_value_map.h",
     "content_settings_rule.cc",
     "content_settings_rule.h",
+    "content_settings_usages_state.cc",
+    "content_settings_usages_state.h",
     "content_settings_utils.cc",
     "content_settings_utils.h",
     "local_shared_objects_counter.h",

chrome/browser/content_settings/content_settings_usages_state.cc → components/content_settings/core/browser/content_settings_usages_state.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_usages_state.h"
+#include "components/content_settings/core/browser/content_settings_usages_state.h"
 
 #include <string>
 

chrome/browser/content_settings/content_settings_usages_state.h → components/content_settings/core/browser/content_settings_usages_state.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_USAGES_STATE_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_USAGES_STATE_H_
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_USAGES_STATE_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_USAGES_STATE_H_
 
 #include <map>
 #include <set>
@@ -83,4 +83,4 @@ class ContentSettingsUsagesState {
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsUsagesState);
 };
 
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_USAGES_STATE_H_
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_USAGES_STATE_H_