Move PermissionRequestID to chrome/browser/permissions/.

chrome/browser/geolocation/geolocation_permission_context.cc

Index: chrome/browser/geolocation/geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc
index 06f05112a07fd2f9a3f8a3a208045734e4a686bb..df90856286a8020f0e7e1faf670f7f871cea882c 100644
--- a/chrome/browser/geolocation/geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/render_frame_host.h"
@@ -34,7 +34,7 @@ void GeolocationPermissionContext::RequestPermission(
   bool permission_set;
   bool new_permission;
   if (extensions_context_.RequestPermission(
-      web_contents, id, id.bridge_id(), requesting_frame_origin, user_gesture,
+      web_contents, id, id.request_id(), requesting_frame_origin, user_gesture,
       callback, &permission_set, &new_permission)) {
     if (permission_set) {
       ContentSetting content_setting =
@@ -60,7 +60,7 @@ void GeolocationPermissionContext::CancelPermissionRequest(
     const PermissionRequestID& id) {
 
     if (extensions_context_.CancelPermissionRequest(
-        web_contents, id.bridge_id()))
+        web_contents, id.request_id()))
       return;
     PermissionContextBase::CancelPermissionRequest(web_contents, id);
 }