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

content/browser/browser_plugin/browser_plugin_guest.h

 // 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.
 
 // A BrowserPluginGuest is the browser side of a browser <--> embedder
 // renderer channel. A BrowserPlugin (a WebPlugin) is on the embedder
 // renderer side of browser <--> embedder renderer communication.
 //
 // BrowserPluginGuest lives on the UI thread of the browser process. It has a
 // helper, BrowserPluginGuestHelper, which is a RenderViewHostObserver. The
@@ skipping 386 matching lines @@
   // Weak pointer used to ask GeolocationPermissionContext about geolocation
   // permission.
   base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_;
 
   // Static factory instance (always NULL for non-test).
   static BrowserPluginHostFactory* factory_;
 
   NotificationRegistrar notification_registrar_;
   scoped_ptr<EmbedderRenderViewHostObserver> embedder_rvh_observer_;
   WebContentsImpl* embedder_web_contents_;
-  typedef std::map<int, GeolocationCallback> GeolocationRequestsMap;
-  GeolocationRequestsMap geolocation_request_callback_map_;
+
+  // GeolocationRequestItem contains callback and bridge id for a request.
+  typedef std::pair<GeolocationCallback, int> GeolocationRequestItem;
+  typedef std::map<int, GeolocationRequestItem> GeolocationRequestsMap;
+  GeolocationRequestsMap geolocation_request_map_;
+  std::map<int, int> bridge_id_to_request_id_map_;
+
   // An identifier that uniquely identifies a browser plugin guest within an
   // embedder.
   int instance_id_;
   scoped_ptr<base::SharedMemory> damage_buffer_;
   // An identifier that uniquely identifies a damage buffer.
   uint32 damage_buffer_sequence_id_;
   size_t damage_buffer_size_;
   gfx::Size damage_view_size_;
   float damage_buffer_scale_factor_;
   gfx::Rect guest_window_rect_;
@@ skipping 26 matching lines @@
 
   typedef std::map<int, base::Callback<void(bool)> > DownloadRequestMap;
   DownloadRequestMap download_request_callback_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_