Move PermissionRequestID to chrome/browser/permissions/.

chrome/browser/permissions/permission_request_id.cc

Index: chrome/browser/permissions/permission_request_id.cc
diff --git a/components/content_settings/core/common/permission_request_id.cc b/chrome/browser/permissions/permission_request_id.cc
similarity index 64%
rename from components/content_settings/core/common/permission_request_id.cc
rename to chrome/browser/permissions/permission_request_id.cc
index 7d7eccbad794501052174e7da08c03e4d69d6ab3..c78bb100a071ca30c3666626aede7486056ae385 100644
--- a/components/content_settings/core/common/permission_request_id.cc
+++ b/chrome/browser/permissions/permission_request_id.cc
@@ -1,35 +1,39 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 "components/content_settings/core/common/permission_request_id.h"
+#include "chrome/browser/permissions/permission_request_id.h"
 
 #include "base/strings/stringprintf.h"
 
 PermissionRequestID::PermissionRequestID(int render_process_id,
                                          int render_frame_id,
-                                         int bridge_id,
+                                         int request_id,
                                          const GURL& origin)
     : render_process_id_(render_process_id),
       render_frame_id_(render_frame_id),
-      bridge_id_(bridge_id),
+      request_id_(request_id),
       origin_(origin) {
 }
 
 PermissionRequestID::~PermissionRequestID() {
 }
 
-bool PermissionRequestID::Equals(const PermissionRequestID& other) const {
+bool PermissionRequestID::operator==(const PermissionRequestID& other) const {
   return render_process_id_ == other.render_process_id_ &&
          render_frame_id_ == other.render_frame_id_ &&
-         bridge_id_ == other.bridge_id_ &&
+         request_id_ == other.request_id_ &&
          origin_ == other.origin_;
 }
 
+bool PermissionRequestID::operator!=(const PermissionRequestID& other) const {
+  return !operator==(other);
+}
+
 std::string PermissionRequestID::ToString() const {
   return base::StringPrintf("%d,%d,%d,%s",
                             render_process_id_,
                             render_frame_id_,
-                            bridge_id_,
+                            request_id_,
                             origin_.spec().c_str());
 }