Componentize permission_request_id.*

Files moved and includes adjusted.

BUG=387072

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

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

chrome/browser/chrome_content_browser_client.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/download/download_prefs.h"
@@ -93,6 +92,7 @@
 #include "components/cloud_devices/common/cloud_devices_switches.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/metrics/client_info.h"

chrome/browser/content_settings/permission_bubble_request_impl.h

@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
 
 #include "base/callback.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 
 class GURL;
 

chrome/browser/content_settings/permission_context_base.cc

@@ -10,11 +10,11 @@
 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/pref_names.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 

chrome/browser/content_settings/permission_context_base_unittest.cc

@@ -7,12 +7,12 @@
 #include "base/bind.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #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/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/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/web_contents_tester.h"

chrome/browser/content_settings/permission_infobar_delegate.h

@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_INFOBAR_DELEGATE_H_
 
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "content/public/browser/web_contents.h"
 

chrome/browser/content_settings/permission_queue_controller_unittest.cc

@@ -6,11 +6,11 @@
 
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/infobars/infobar_service.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_types.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/geolocation/geolocation_infobar_delegate.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/permission_request_id.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 

chrome/browser/geolocation/geolocation_permission_context.cc

@@ -12,7 +12,6 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"

chrome/browser/geolocation/geolocation_permission_context_android.h

@@ -25,8 +25,8 @@
 // per site settings) are queried on the UI thread while the system level
 // permissions are considered I/O and thus checked in the blocking thread pool.
 
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "url/gurl.h"
 
 namespace content {

chrome/browser/geolocation/geolocation_permission_context_extensions.cc

@@ -7,8 +7,8 @@
 #include "base/callback.h"
 
 #if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/process_map.h"

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

@@ -17,12 +17,12 @@
 #include "base/time/clock.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/infobars/infobar_service.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/permission_request_id.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/media/midi_permission_context.cc

@@ -4,8 +4,8 @@
 
 #include "chrome/browser/media/midi_permission_context.h"
 
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "url/gurl.h"
 
 MidiPermissionContext::MidiPermissionContext(Profile* profile)

chrome/browser/media/midi_permission_infobar_delegate.cc

@@ -5,10 +5,10 @@
 #include "chrome/browser/media/midi_permission_infobar_delegate.h"
 
 #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/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"

chrome/browser/media/protected_media_identifier_infobar_delegate.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/permission_request_id.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 

chrome/browser/media/protected_media_identifier_permission_context.cc

@@ -12,11 +12,11 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/pref_names.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"

chrome/browser/notifications/desktop_notification_infobar_delegate.cc

@@ -5,11 +5,11 @@
 #include "chrome/browser/notifications/desktop_notification_infobar_delegate.h"
 
 #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/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"

chrome/browser/services/gcm/push_messaging_service_impl.cc

@@ -10,7 +10,6 @@
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/services/gcm/push_messaging_permission_context_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_context.h"

chrome/chrome_browser.gypi

@@ -307,8 +307,6 @@
       'browser/content_settings/permission_infobar_delegate.h',
       'browser/content_settings/permission_queue_controller.cc',
       'browser/content_settings/permission_queue_controller.h',
-      'browser/content_settings/permission_request_id.cc',
-      'browser/content_settings/permission_request_id.h',
       'browser/content_settings/tab_specific_content_settings.cc',
       'browser/content_settings/tab_specific_content_settings.h',
       'browser/crash_upload_list.cc',

components/content_settings.gypi

@@ -52,6 +52,8 @@
         'content_settings/core/common/content_settings_pattern_parser.cc',
         'content_settings/core/common/content_settings_pattern_parser.h',
         'content_settings/core/common/content_settings_types.h',
+        'content_settings/core/common/permission_request_id.h',
+        'content_settings/core/common/permission_request_id.cc',
       ],
     },
   ],

components/content_settings/core/common/BUILD.gn

@@ -11,6 +11,8 @@ static_library("common") {
     "content_settings_pattern_parser.cc",
     "content_settings_pattern_parser.h",
     "content_settings_types.h",
+    "permission_request_id.h",
+    "permission_request_id.cc",
   ]
 
   deps = [

chrome/browser/content_settings/permission_request_id.cc → components/content_settings/core/common/permission_request_id.cc

@@ -2,11 +2,10 @@
 // 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/permission_request_id.h"
+#include "components/content_settings/core/common/permission_request_id.h"
 
 #include "base/strings/stringprintf.h"
 
-
 PermissionRequestID::PermissionRequestID(int render_process_id,
                                          int render_view_id,
                                          int bridge_id,
@@ -22,13 +21,13 @@ PermissionRequestID::~PermissionRequestID() {
 
 bool PermissionRequestID::Equals(const PermissionRequestID& other) const {
   return IsForSameTabAs(other) && (bridge_id_ == other.bridge_id_) &&
-      (origin_ == other.origin());
+         (origin_ == other.origin());
 }
 
 bool PermissionRequestID::IsForSameTabAs(
     const PermissionRequestID& other) const {
   return (render_process_id_ == other.render_process_id_) &&
-      (render_view_id_ == other.render_view_id_);
+         (render_view_id_ == other.render_view_id_);
 }
 
 std::string PermissionRequestID::ToString() const {

chrome/browser/content_settings/permission_request_id.h → components/content_settings/core/common/permission_request_id.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_PERMISSION_REQUEST_ID_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_REQUEST_ID_H_
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_PERMISSION_REQUEST_ID_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_PERMISSION_REQUEST_ID_H_
 
 #include <string>
 
@@ -39,4 +39,4 @@ class PermissionRequestID {
   // Purposefully do not disable copying, as this is stored in STL containers.
 };
 
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_REQUEST_ID_H_
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_PERMISSION_REQUEST_ID_H_