GeolocationPermissionContext: only use origin from embedder url.

chrome/browser/geolocation/chrome_geolocation_permission_context.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 "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
   // destroyed on the UI thread.
   DCHECK(!permission_queue_controller_.get());
 }
 
 void ChromeGeolocationPermissionContext::RequestGeolocationPermission(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame,
     base::Callback<void(bool)> callback) {
+  GURL requesting_frame_origin = requesting_frame.GetOrigin();
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ChromeGeolocationPermissionContext::RequestGeolocationPermission,
             this, render_process_id, render_view_id, bridge_id,
-            requesting_frame, callback));
+            requesting_frame_origin, callback));
     return;
   }
 
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
 
   content::WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
   const PermissionRequestID id(render_process_id, render_view_id,
                                           bridge_id);
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (extension_service) {
     const extensions::Extension* extension =
         extension_service->extensions()->GetExtensionOrAppByURL(
-            requesting_frame);
+            requesting_frame_origin);
     if (IsExtensionWithPermissionOrSuggestInConsole(APIPermission::kGeolocation,
                                                     extension,
                                                     profile_)) {
       // Make sure the extension is in the calling process.
       if (extension_service->process_map()->Contains(extension->id(),
                                                      id.render_process_id())) {
-        NotifyPermissionSet(id, requesting_frame, callback, true);
+        NotifyPermissionSet(id, requesting_frame_origin, callback, true);
         return;
       }
     }
   }
 
   if (extensions::GetViewType(web_contents) !=
       extensions::VIEW_TYPE_TAB_CONTENTS) {
     // The tab may have gone away, or the request may not be from a tab at all.
     // TODO(mpcomplete): the request could be from a background page or
     // extension popup (web_contents will have a different ViewType). But why do
     // we care? Shouldn't we still put an infobar up in the current tab?
     LOG(WARNING) << "Attempt to use geolocation tabless renderer: "
                  << id.ToString()
                  << " (can't prompt user without a visible tab)";
-    NotifyPermissionSet(id, requesting_frame, callback, false);
+    NotifyPermissionSet(id, requesting_frame_origin, callback, false);
     return;
   }
 
-  GURL embedder = web_contents->GetURL();
-  if (!requesting_frame.is_valid() || !embedder.is_valid()) {
+  GURL embedder = web_contents->GetLastCommittedURL().GetOrigin();
+  if (!requesting_frame_origin.is_valid() || !embedder.is_valid()) {
     LOG(WARNING) << "Attempt to use geolocation from an invalid URL: "
-                 << requesting_frame << "," << embedder
+                 << requesting_frame_origin << "," << embedder
                  << " (geolocation is not supported in popups)";
-    NotifyPermissionSet(id, requesting_frame, callback, false);
+    NotifyPermissionSet(id, requesting_frame_origin, callback, false);
     return;
   }
 
-  DecidePermission(id, requesting_frame, embedder, callback);
+  DecidePermission(id, requesting_frame_origin, embedder, callback);
 }
 
 void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame) {
   CancelPendingInfoBarRequest(PermissionRequestID(
       render_process_id, render_view_id, bridge_id));
 }
@@ skipping 83 matching lines @@
         base::Bind(
             &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
             this, id));
      return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
   QueueController()->CancelInfoBarRequest(id);
 }