Move PermissionRequestID to chrome/browser/permissions/.

chrome/browser/content_settings/permission_queue_controller.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/content_settings/permission_queue_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"
@@ skipping 163 matching lines @@
   if (!AlreadyShowingInfoBarForTab(id))
     ShowQueuedInfoBarForTab(id);
 }
 
 void PermissionQueueController::CancelInfoBarRequest(
     const PermissionRequestID& id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   for (PendingInfobarRequests::iterator i(pending_infobar_requests_.begin());
        i != pending_infobar_requests_.end(); ++i) {
-    if (!i->id().Equals(id))
+    if (id != i->id())
       continue;
 
     InfoBarService* infobar_service = GetInfoBarService(id);
     if (infobar_service && i->has_infobar())
       infobar_service->RemoveInfoBar(i->infobar());
     else
       pending_infobar_requests_.erase(i);
     return;
   }
 }
@@ skipping 27 matching lines @@
        i != pending_infobar_requests_.end(); ++i) {
     if (!i->IsForPair(requesting_frame, embedder))
       continue;
     requests_to_notify.push_back(*i);
     if (!i->has_infobar()) {
       // We haven't created an infobar yet, just record the pending request
       // index and remove it later.
       pending_requests_to_remove.push_back(i);
       continue;
     }
-    if (i->id().Equals(id)) {
+    if (id == i->id()) {
       // The infobar that called us is i->infobar(), and its delegate is
       // currently in either Accept() or Cancel(). This means that
       // RemoveInfoBar() will be called later on, and that will trigger a
       // notification we're observing.
       continue;
     }
 
     // This infobar is for the same frame/embedder pair, but in a different
     // tab. We should remove it now that we've got an answer for it.
     infobars_to_remove.push_back(*i);
@@ skipping 148 matching lines @@
       ContentSettingsPattern::Wildcard() :
       ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());
 
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),
       embedder_pattern,
       type_,
       std::string(),
       content_setting);
 }