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

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 4be6d372d68490c9fe7e1bf90a8eca2397f371c9..cd67ae1144db58aa6b8fca9bf1895076cedb5b96 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -37,8 +37,10 @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using content::BrowserThread;
+using WebKit::WebSecurityOrigin;
 
 // GeolocationInfoBarQueueController ------------------------------------------
 
@@ -551,14 +553,18 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission(
   }
   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);
-    if (ext && ext->HasAPIPermission(ExtensionAPIPermission::kGeolocation)) {
+  ExtensionService* extension_service = profile_->GetExtensionService();
+  if (extension_service) {
+    const Extension* extension =
+        extension_service->extensions()->GetByURL(ExtensionURLInfo(
+            WebSecurityOrigin::createFromString(
+                UTF8ToUTF16(requesting_frame.spec())),
+            requesting_frame));
+    if (extension &&
+        extension->HasAPIPermission(ExtensionAPIPermission::kGeolocation)) {
       // Make sure the extension is in the calling process.
-      if (extensions->process_map()->Contains(ext->id(), render_process_id)) {
+      if (extension_service->process_map()->Contains(
+              extension->id(), render_process_id)) {
         NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
                             requesting_frame, callback, true);
         return;