Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

 // Copyright (c) 2011 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 533 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ChromeGeolocationPermissionContext::RequestGeolocationPermission,
             this, render_process_id, render_view_id, bridge_id,
             requesting_frame, callback));
     return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  ExtensionService* extensions = profile_->GetExtensionService();
-  if (extensions) {
-    const Extension* ext = extensions->GetExtensionByURL(requesting_frame);
-    if (!ext)
-      ext = extensions->GetExtensionByWebExtent(requesting_frame);
+  ExtensionService* ext_service = profile_->GetExtensionService();
+  if (ext_service) {
+    const Extension* ext =
+        ext_service->extensions()->GetByURL(ExtensionURLInfo(requesting_frame));

[abarth-chromium, 2011/12/07 23:51:44]

This one probably needs a SecurityOrigin too.  Sandboxed iframes shouldn't get
geolocation privileges.

[Yoyo Zhou, 2011/12/08 01:04:51]

Looks like this one is changing a security origin to a string for IPC, which
becomes the requesting_frame here:

http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/content/renderer/geol...

Is this okay? If so, is WebSecurityOrigin::createFromString safe to use?

There's a TODO in that code to make the IPCs use the actual origin. I could try
to do that, but the IPC serialization for WebSecurityOrigin hasn't been written
yet. So if this example works, it'll be simpler to convert to string (as here).

     if (ext && ext->HasAPIPermission(ExtensionAPIPermission::kGeolocation)) {
       // Make sure the extension is in the calling process.
-      if (extensions->process_map()->Contains(ext->id(), render_process_id)) {
+      if (ext_service->process_map()->Contains(ext->id(), render_process_id)) {
         NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
                             requesting_frame, callback, true);
         return;
       }
     }
   }
 
   TabContents* tab_contents =
       tab_util::GetTabContentsByID(render_process_id, render_view_id);
   if (!tab_contents ||
@@ skipping 90 matching lines @@
         BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
             this, render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id,
       render_view_id, bridge_id);
 }