Fix Guest geolocation API, we were using |bridge_id| and |request_id| interchangeably which is wron…

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 521 matching lines @@
       new BrowserPluginMsg_LoadRedirect(instance_id(),
                                         old_url,
                                         new_url,
                                         is_top_level));
 }
 
 void BrowserPluginGuest::AskEmbedderForGeolocationPermission(
     int bridge_id,
     const GURL& requesting_frame,
     const GeolocationCallback& callback) {
-  if (geolocation_request_callback_map_.size() >=
-          kNumMaxOutstandingPermissionRequests) {
+  if (geolocation_request_map_.size() >= kNumMaxOutstandingPermissionRequests) {
     // Deny the geolocation request.
     callback.Run(false);
     return;
   }
   int request_id = next_permission_request_id_++;
-  geolocation_request_callback_map_[request_id] = callback;
+  geolocation_request_map_[request_id] = std::make_pair(callback, bridge_id);
+  DCHECK(bridge_id_to_request_id_map_.find(bridge_id) ==
+         bridge_id_to_request_id_map_.end());
+  bridge_id_to_request_id_map_[bridge_id] = request_id;
 
   base::DictionaryValue request_info;
   request_info.Set(browser_plugin::kURL,
                    base::Value::CreateStringValue(requesting_frame.spec()));
 
   SendMessageToEmbedder(
       new BrowserPluginMsg_RequestPermission(instance_id(),
           BrowserPluginPermissionTypeGeolocation, request_id, request_info));
 }
 
 void BrowserPluginGuest::CancelGeolocationRequest(int bridge_id) {
+  std::map<int, int>::iterator iter =
+      bridge_id_to_request_id_map_.find(bridge_id);
+  if (iter == bridge_id_to_request_id_map_.end())
+    return;
+
+  int request_id = iter->second;
   GeolocationRequestsMap::iterator callback_iter =
-      geolocation_request_callback_map_.find(bridge_id);
-  if (callback_iter != geolocation_request_callback_map_.end())
-    geolocation_request_callback_map_.erase(callback_iter);
+      geolocation_request_map_.find(request_id);
+  if (callback_iter != geolocation_request_map_.end())
+    geolocation_request_map_.erase(callback_iter);
 }
 
 void BrowserPluginGuest::SetGeolocationPermission(int request_id,
                                                   bool allowed) {
   GeolocationRequestsMap::iterator callback_iter =
-      geolocation_request_callback_map_.find(request_id);
-  if (callback_iter != geolocation_request_callback_map_.end()) {
-    callback_iter->second.Run(allowed);
-    geolocation_request_callback_map_.erase(callback_iter);
+      geolocation_request_map_.find(request_id);
+  if (callback_iter != geolocation_request_map_.end()) {
+    GeolocationRequestItem& item = callback_iter->second;
+    item.first.Run(allowed);
+    bridge_id_to_request_id_map_.erase(item.second);
+    geolocation_request_map_.erase(callback_iter);
   }
 }
 
 void BrowserPluginGuest::DidCommitProvisionalLoadForFrame(
     int64 frame_id,
     bool is_main_frame,
     const GURL& url,
     PageTransition transition_type,
     RenderViewHost* render_view_host) {
   // Inform its embedder of the updated URL.
@@ skipping 720 matching lines @@
                    base::Value::CreateStringValue(request_method));
   request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
 
   SendMessageToEmbedder(
       new BrowserPluginMsg_RequestPermission(instance_id(),
           BrowserPluginPermissionTypeDownload, permission_request_id,
           request_info));
 }
 
 }  // namespace content