Move PermissionRequestID to chrome/browser/permissions/.

chrome/browser/media/protected_media_identifier_permission_context.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.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/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #if defined(OS_CHROMEOS)
 #include <utility>
 
 #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
@@ skipping 109 matching lines @@
   return content_setting;
 }
 
 void ProtectedMediaIdentifierPermissionContext::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if defined(OS_CHROMEOS)
   PendingRequestMap::iterator request = pending_requests_.find(web_contents);
-  if (request == pending_requests_.end() || !request->second.second.Equals(id))
+  if (request == pending_requests_.end() || (request->second.second != id))
     return;
 
   views::Widget* widget = request->second.first;
   pending_requests_.erase(request);
 
   // If |web_contents| is being destroyed, |widget| could be invalid. No need to
   // manually close it here. Otherwise, close the |widget| here.
   // OnPlatformVerificationConsentResponse() will be fired during this process,
   // but since |web_contents| is removed from |pending_requests_|, the callback
   // will simply be dropped.
@@ skipping 67 matching lines @@
         const PermissionRequestID& id,
         const GURL& requesting_origin,
         const GURL& embedding_origin,
         const BrowserPermissionCallback& callback,
         PlatformVerificationDialog::ConsentResponse response) {
   // The request may have been canceled. Drop the callback in that case.
   PendingRequestMap::iterator request = pending_requests_.find(web_contents);
   if (request == pending_requests_.end())
     return;
 
-  DCHECK(request->second.second.Equals(id));
+  DCHECK(request->second.second == id);
   pending_requests_.erase(request);
 
   ContentSetting content_setting = CONTENT_SETTING_ASK;
   bool persist = false; // Whether the ContentSetting should be saved.
   switch (response) {
     case PlatformVerificationDialog::CONSENT_RESPONSE_NONE:
       content_setting = CONTENT_SETTING_ASK;
       persist = false;
       break;
     case PlatformVerificationDialog::CONSENT_RESPONSE_ALLOW:
@@ skipping 10 matching lines @@
       content_setting = CONTENT_SETTING_BLOCK;
       persist = true;
       break;
   }
 
   NotifyPermissionSet(
       id, requesting_origin, embedding_origin, callback,
       persist, content_setting);
 }
 #endif