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

chrome/browser/extensions/extension_function_dispatcher.cc

Index: chrome/browser/extensions/extension_function_dispatcher.cc
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index c5891bee75754587e7bf3768d5e66b74ff4b4689..7f6040dbcd013a8591fe8a248f0b12e0e80a4383 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -65,11 +65,13 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/api/extension_api.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/extensions/extension_input_api.h"
@@ -88,6 +90,7 @@
 #endif
 
 using extensions::ExtensionAPI;
+using WebKit::WebSecurityOrigin;
 
 // FactoryRegistry -------------------------------------------------------------
 
@@ -610,7 +613,9 @@ void ExtensionFunctionDispatcher::Dispatch(
   const Extension* extension = service->GetExtensionById(
       params.extension_id, false);
   if (!extension)
-    extension = service->GetExtensionByWebExtent(params.source_url);
+    extension = service->extensions()->GetByWebExtent(ExtensionURLInfo(
+        WebSecurityOrigin::createFromString(params.source_origin),
+        params.source_url));
 
   scoped_refptr<ExtensionFunction> function(
       CreateExtensionFunction(params, extension,