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

content/browser/browser_plugin/browser_plugin_geolocation_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 "content/browser/browser_plugin/browser_plugin_geolocation_permission_context.h"
 
 #include "base/bind.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 31 matching lines @@
     return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Note that callback.Run(true) allows geolocation access, callback.Run(false)
   // denies geolocation access.
   // We need to go to the renderer to ask embedder's js if we are allowed to
   // have geolocation access.
   RenderViewHost* rvh = RenderViewHost::FromID(render_process_id,
                                                render_view_id);
-  DCHECK(rvh);
   if (rvh) {
     DCHECK(rvh->GetProcess()->IsGuest());
     WebContentsImpl* guest_web_contents =
         static_cast<WebContentsImpl*>(rvh->GetDelegate()->GetAsWebContents());
     BrowserPluginGuest* guest = guest_web_contents->GetBrowserPluginGuest();
     guest->AskEmbedderForGeolocationPermission(bridge_id,
                                                requesting_frame,
                                                callback);
   }
 }
@@ skipping 23 matching lines @@
     DCHECK(rvh->GetProcess()->IsGuest());
     WebContentsImpl* guest_web_contents =
         static_cast<WebContentsImpl*>(rvh->GetDelegate()->GetAsWebContents());
     BrowserPluginGuest* guest = guest_web_contents->GetBrowserPluginGuest();
     if (guest)
       guest->CancelGeolocationRequest(bridge_id);
   }
 }
 
 }  // namespace content