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

ExtensionService::GetExtensionByURL -> GetByID with the host
ExtensionService::GetExtensionByWebExtent -> GetHostedAppByURL
GetByURL -> GetExtensionOrAppByURL

BUG=104091
TEST=existing tests


Review URL: http://codereview.chromium.org/8827013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114148 0039d316-1c4b-4281-b951-d872f2087c98

32 files changed, 183 insertions, 184 deletions

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 7cba0c3..51e29a2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -57,6 +57,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
@@ -178,7 +179,8 @@ RenderProcessHostPrivilege GetPrivilegeRequiredByUrl(
     return PRIV_NORMAL;
 
   if (url.SchemeIs(chrome::kExtensionScheme)) {
-    const Extension* extension = service->GetExtensionByURL(url);
+    const Extension* extension =
+        service->extensions()->GetByID(url.host());
     if (extension && extension->is_storage_isolated())
       return PRIV_ISOLATED;
     if (extension && extension->is_hosted_app())
@@ -376,8 +378,8 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
   if (!profile || !profile->GetExtensionService())
     return url;
 
-  const Extension* extension =
-      profile->GetExtensionService()->GetExtensionByWebExtent(url);
+  const Extension* extension = profile->GetExtensionService()->extensions()->
+      GetHostedAppByURL(ExtensionURLInfo(url));
   if (!extension)
     return url;
 
@@ -403,8 +405,8 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
   if (!profile || !profile->GetExtensionService())
     return false;
 
-  const Extension* extension =
-      profile->GetExtensionService()->GetExtensionByURL(effective_url);
+  const Extension* extension = profile->GetExtensionService()->extensions()->
+      GetExtensionOrAppByURL(ExtensionURLInfo(effective_url));
   if (!extension)
     return false;
 
@@ -489,9 +491,8 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
     return;
 
   const Extension* extension =
-      service->GetExtensionByURL(site_instance->site());
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(site_instance->site());
+      service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(
+          site_instance->site()));
   if (!extension)
     return;
 
@@ -519,9 +520,8 @@ void ChromeContentBrowserClient::SiteInstanceDeleting(
     return;
 
   const Extension* extension =
-      service->GetExtensionByURL(site_instance->site());
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(site_instance->site());
+      service->extensions()->GetExtensionOrAppByURL(
+          ExtensionURLInfo(site_instance->site()));
   if (!extension)
     return;
 
diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc
index b3c95a7..0184147 100644
--- a/chrome/browser/chromeos/login/help_app_launcher.cc
+++ b/chrome/browser/chromeos/login/help_app_launcher.cc
@@ -46,7 +46,7 @@ void HelpAppLauncher::ShowHelpTopic(HelpTopic help_topic_id) {
                               static_cast<int>(help_topic_id)));
   // HelpApp component extension presents only in official builds so we can
   // show help only when the extensions is installed.
-  if (service->GetExtensionByURL(url))
+  if (service->extensions()->GetByID(url.host()))
     ShowHelpTopicDialog(GURL(url));
 }
 
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index 1eae409..4ae10e0 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -91,7 +91,8 @@ std::string OfflineLoadPage::GetHTMLContents() {
   ExtensionService* extensions_service = profile->GetExtensionService();
   // Extension service does not exist in test.
   if (extensions_service)
-    extension = extensions_service->GetExtensionByWebExtent(url());
+    extension = extensions_service->extensions()->GetHostedAppByURL(
+        ExtensionURLInfo(url()));
 
   if (extension)
     GetAppOfflineStrings(extension, failed_url, &strings);
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 66c6b73..6838e42 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -390,8 +390,8 @@ void CrxInstaller::ConfirmInstall() {
 
   GURL overlapping_url;
   const Extension* overlapping_extension =
-      frontend_weak_->
-      GetExtensionByOverlappingWebExtent(extension_->web_extent());
+      frontend_weak_->extensions()->
+      GetHostedAppByOverlappingWebExtent(extension_->web_extent());
   if (overlapping_extension &&
       overlapping_extension->id() != extension_->id()) {
     ReportFailureFromUIThread(l10n_util::GetStringFUTF8(
diff --git a/chrome/browser/extensions/extension_chrome_auth_private_api.cc b/chrome/browser/extensions/extension_chrome_auth_private_api.cc
index 1bb9be7..1f4e6db 100644
--- a/chrome/browser/extensions/extension_chrome_auth_private_api.cc
+++ b/chrome/browser/extensions/extension_chrome_auth_private_api.cc
@@ -23,7 +23,8 @@ bool IsCloudPrintEnableURL(Profile* profile, const GURL& url) {
 #endif  // !defined(OS_CHROMEOS)
     return false;
   }
-  return (service->GetExtensionByWebExtent(url) == cloud_print_app);
+  return (service->extensions()->GetHostedAppByURL(ExtensionURLInfo(url)) ==
+          cloud_print_app);
 }
 
 bool test_mode = false;
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 7805496..ade3c4a 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 -------------------------------------------------------------
 
@@ -608,10 +611,12 @@ void ExtensionFunctionDispatcher::Dispatch(
   if (!service || !process_map)
     return;
 
-  const Extension* extension = service->GetExtensionById(
-      params.extension_id, false);
+  const Extension* extension = service->extensions()->GetByID(
+      params.extension_id);
   if (!extension)
-    extension = service->GetExtensionByWebExtent(params.source_url);
+    extension = service->extensions()->GetHostedAppByURL(ExtensionURLInfo(
+        WebSecurityOrigin::createFromString(params.source_origin),
+        params.source_url));
 
   scoped_refptr<ExtensionFunction> function(
       CreateExtensionFunction(params, extension,
diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc
index b823960..a0a05a3 100644
--- a/chrome/browser/extensions/extension_info_map_unittest.cc
+++ b/chrome/browser/extensions/extension_info_map_unittest.cc
@@ -144,11 +144,11 @@ TEST_F(ExtensionInfoMapTest, CheckPermissions) {
 
   // The app should have the notifications permission, either from a
   // chrome-extension URL or from its web extent.
-  const Extension* match = info_map->extensions().GetByURL(
+  const Extension* match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, app->GetResourceURL("a.html")));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(ExtensionAPIPermission::kNotification));
-  match = info_map->extensions().GetByURL(
+  match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, app_url));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(ExtensionAPIPermission::kNotification));
@@ -156,7 +156,7 @@ TEST_F(ExtensionInfoMapTest, CheckPermissions) {
       match->HasAPIPermission(ExtensionAPIPermission::kTab));
 
   // The extension should have the tabs permission.
-  match = info_map->extensions().GetByURL(
+  match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, extension->GetResourceURL("a.html")));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(ExtensionAPIPermission::kTab));
@@ -165,12 +165,12 @@ TEST_F(ExtensionInfoMapTest, CheckPermissions) {
 
   // Random URL should not have any permissions.
   GURL evil_url("http://evil.com/a.html");
-  match = info_map->extensions().GetByURL(
+  match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(WebSecurityOrigin::create(evil_url), evil_url));
   EXPECT_FALSE(match);
 
   // Sandboxed origins should not have any permissions.
-  match = info_map->extensions().GetByURL(ExtensionURLInfo(
+  match = info_map->extensions().GetExtensionOrAppByURL(ExtensionURLInfo(
       WebSecurityOrigin::createFromString(WebString::fromUTF8("null")),
       app_url));
   EXPECT_FALSE(match);
diff --git a/chrome/browser/extensions/extension_navigation_observer.cc b/chrome/browser/extensions/extension_navigation_observer.cc
index a08a9ec..931adbb 100644
--- a/chrome/browser/extensions/extension_navigation_observer.cc
+++ b/chrome/browser/extensions/extension_navigation_observer.cc
@@ -52,7 +52,8 @@ void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary(
 
   ExtensionService* extension_service = profile_->GetExtensionService();
   const Extension* extension =
-      extension_service->GetDisabledExtensionByWebExtent(nav_entry->url());
+      extension_service->disabled_extensions()->
+      GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->url()));
   if (!extension)
     return;
 
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 50e8536..33e92f3 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -54,10 +54,6 @@ class IncognitoExtensionProcessManager : public ExtensionProcessManager {
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
-  // Returns the extension for an URL, which can either be a chrome-extension
-  // URL or a web app URL.
-  const Extension* GetExtensionOrAppByURL(const GURL& url);
-
   // Returns true if the extension is allowed to run in incognito mode.
   bool IsIncognitoEnabled(const Extension* extension);
 
@@ -146,7 +142,8 @@ ExtensionHost* ExtensionProcessManager::CreateViewHost(
       Profile::FromBrowserContext(browsing_instance_->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   if (service) {
-    const Extension* extension = service->GetExtensionByURL(url);
+    const Extension* extension =
+        service->extensions()->GetByID(url.host());
     if (extension)
       return CreateViewHost(extension, url, browser, view_type);
   }
@@ -439,23 +436,16 @@ void IncognitoExtensionProcessManager::CreateBackgroundHost(
 
 SiteInstance* IncognitoExtensionProcessManager::GetSiteInstanceForURL(
     const GURL& url) {
-  const Extension* extension = GetExtensionOrAppByURL(url);
-  if (!extension || extension->incognito_split_mode()) {
-    return ExtensionProcessManager::GetSiteInstanceForURL(url);
-  } else {
-    return original_manager_->GetSiteInstanceForURL(url);
-  }
-}
-
-const Extension* IncognitoExtensionProcessManager::GetExtensionOrAppByURL(
-    const GURL& url) {
   Profile* profile =
       Profile::FromBrowserContext(browsing_instance_->browser_context());
   ExtensionService* service = profile->GetExtensionService();
-  if (!service)
-    return NULL;
-  return (url.SchemeIs(chrome::kExtensionScheme)) ?
-      service->GetExtensionByURL(url) : service->GetExtensionByWebExtent(url);
+  if (service) {
+    const Extension* extension = service->extensions()->GetExtensionOrAppByURL(
+        ExtensionURLInfo(url));
+    if (extension && !extension->incognito_split_mode())
+      return original_manager_->GetSiteInstanceForURL(url);
+  }
+  return ExtensionProcessManager::GetSiteInstanceForURL(url);
 }
 
 bool IncognitoExtensionProcessManager::IsIncognitoEnabled(
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index a1b22f3..3c55e302 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -258,8 +258,10 @@ static const char* kAllowedDownloadURLPatterns[] = {
 
 bool ExtensionService::IsDownloadFromGallery(const GURL& download_url,
                                              const GURL& referrer_url) {
-  const Extension* download_extension = GetExtensionByWebExtent(download_url);
-  const Extension* referrer_extension = GetExtensionByWebExtent(referrer_url);
+  const Extension* download_extension =
+      extensions_.GetHostedAppByURL(ExtensionURLInfo(download_url));
+  const Extension* referrer_extension =
+      extensions_.GetHostedAppByURL(ExtensionURLInfo(referrer_url));
   const Extension* webstore_app = GetWebStoreApp();
 
   bool referrer_valid = (referrer_extension == webstore_app);
@@ -310,15 +312,10 @@ bool ExtensionService::IsDownloadFromGallery(const GURL& download_url,
 }
 
 const Extension* ExtensionService::GetInstalledApp(const GURL& url) {
-  // Check for hosted app.
-  const Extension* app = GetExtensionByWebExtent(url);
-  if (app)
-    return app;
-
-  // Check for packaged app.
-  app = GetExtensionByURL(url);
-  if (app && app->is_app())
-    return app;
+  const Extension* extension = extensions_.GetExtensionOrAppByURL(
+      ExtensionURLInfo(url));
+  if (extension && extension->is_app())
+    return extension;
 
   return NULL;
 }
@@ -2176,56 +2173,12 @@ const Extension* ExtensionService::GetWebStoreApp() {
   return GetExtensionById(extension_misc::kWebStoreAppId, false);
 }
 
-const Extension* ExtensionService::GetExtensionByURL(const GURL& url) {
-  return url.scheme() != chrome::kExtensionScheme ? NULL :
-      GetExtensionById(url.host(), false);
-}
-
-const Extension* ExtensionService::GetExtensionByWebExtent(const GURL& url) {
-  // TODO(yoz): Should be ExtensionSet::GetByURL.
-  for (ExtensionSet::const_iterator iter = extensions_.begin();
-       iter != extensions_.end(); ++iter) {
-    if ((*iter)->web_extent().MatchesURL(url))
-      return *iter;
-  }
-  return NULL;
-}
-
-const Extension* ExtensionService::GetDisabledExtensionByWebExtent(
-    const GURL& url) {
-  // TODO(yoz): Should be ExtensionSet::GetByURL.
-  for (ExtensionSet::const_iterator iter = disabled_extensions_.begin();
-       iter != disabled_extensions_.end(); ++iter) {
-    if ((*iter)->web_extent().MatchesURL(url))
-      return *iter;
-  }
-  return NULL;
-}
-
 bool ExtensionService::ExtensionBindingsAllowed(const GURL& url) {
-  // Allow bindings for all packaged extensions.
-  // Note that GetExtensionByURL may return an Extension for hosted apps
-  // (excluding bookmark apps) if the URL came from GetEffectiveURL.
-  const Extension* extension = GetExtensionByURL(url);
-  if (extension && extension->GetType() != Extension::TYPE_HOSTED_APP)
-    return true;
-
-  // Allow bindings for all component, hosted apps.
-  if (!extension)
-    extension = GetExtensionByWebExtent(url);
-  return (extension && extension->location() == Extension::COMPONENT);
-}
-
-const Extension* ExtensionService::GetExtensionByOverlappingWebExtent(
-    const URLPatternSet& extent) {
-  // TODO(yoz): Should be in ExtensionSet.
-  for (ExtensionSet::const_iterator iter = extensions_.begin();
-       iter != extensions_.end(); ++iter) {
-    if ((*iter)->web_extent().OverlapsWith(extent))
-      return *iter;
-  }
-
-  return NULL;
+  // Allow bindings for all packaged extensions and component hosted apps.
+  const Extension* extension = extensions_.GetExtensionOrAppByURL(
+      ExtensionURLInfo(url));
+  return extension && (!extension->is_hosted_app() ||
+                       extension->location() == Extension::COMPONENT);
 }
 
 const SkBitmap& ExtensionService::GetOmniboxIcon(
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index acb6119..0abd096 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -357,20 +357,6 @@ class ExtensionService
   // The App that represents the web store.
   const Extension* GetWebStoreApp();
 
-  // Lookup an extension by |url|.
-  const Extension* GetExtensionByURL(const GURL& url);
-
-  // Returns the extension whose web extent contains |url|.
-  const Extension* GetExtensionByWebExtent(const GURL& url);
-
-  // Returns the disabled extension whose web extent contains |url|.
-  const Extension* GetDisabledExtensionByWebExtent(const GURL& url);
-
-  // Returns an extension that contains any URL that overlaps with the given
-  // extent, if one exists.
-  const Extension* GetExtensionByOverlappingWebExtent(
-      const URLPatternSet& extent);
-
   // Returns true if |url| should get extension api bindings and be permitted
   // to make api calls. Note that this is independent of what extension
   // permissions the given extension has been granted.
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index d576dea..f9ae0e2 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -67,7 +67,7 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
     // disabled in incognito mode.
     ExtensionService* service = profile->GetExtensionService();
     if (service)
-      extension_ = service->GetExtensionByURL(page_url);
+      extension_ = service->extensions()->GetByID(page_url.host());
   }
 
   void Init() {
@@ -130,9 +130,8 @@ ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url)
   Profile* profile =
       Profile::FromBrowserContext(tab_contents->browser_context());
   ExtensionService* service = profile->GetExtensionService();
-  const Extension* extension = service->GetExtensionByURL(url);
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(url);
+  const Extension* extension =
+      service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(url));
   DCHECK(extension);
   // Only hide the url for internal pages (e.g. chrome-extension or packaged
   // component apps like bookmark manager.
@@ -224,7 +223,8 @@ bool ExtensionWebUI::HandleChromeURLOverride(
     }
 
     // Verify that the extension that's being referred to actually exists.
-    const Extension* extension = service->GetExtensionByURL(extension_url);
+    const Extension* extension =
+        service->extensions()->GetByID(extension_url.host());
     if (!extension) {
       // This can currently happen if you use --load-extension one run, and
       // then don't use it the next.  It could also happen if an extension
diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc
index fd6f307d..b38703c 100644
--- a/chrome/browser/extensions/extension_webstore_private_api.cc
+++ b/chrome/browser/extensions/extension_webstore_private_api.cc
@@ -72,7 +72,8 @@ bool IsWebStoreURL(Profile* profile, const GURL& url) {
     NOTREACHED();
     return false;
   }
-  return (service->GetExtensionByWebExtent(url) == store);
+  return (service->extensions()->GetHostedAppByURL(ExtensionURLInfo(url)) ==
+          store);
 }
 
 // Whitelists extension IDs for use by webstorePrivate.silentlyInstall.
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 4be6d37..5bc344e 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -35,10 +35,12 @@
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/net_util.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
+using WebKit::WebSecurityOrigin;
 
 // GeolocationInfoBarQueueController ------------------------------------------
 
@@ -551,14 +553,19 @@ 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()->GetExtensionOrAppByURL(
+            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;
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index c06ed53..eac05b6 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -233,7 +233,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
         if (!contents) {
           if (extension_process_map->Contains(host->process()->GetID())) {
             const Extension* extension =
-                extension_service->GetExtensionByURL(url);
+                extension_service->extensions()->GetByID(url.host());
             if (extension) {
               string16 title = UTF8ToUTF16(extension->name());
               process.titles.push_back(title);
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index 8a05b62..1207ea8 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -40,12 +40,14 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/escape.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
+using WebKit::WebSecurityOrigin;
 
 const ContentSetting kDefaultSetting = CONTENT_SETTING_ASK;
 
@@ -406,9 +408,14 @@ string16 DesktopNotificationService::DisplayNameForOrigin(
     const GURL& origin) {
   // If the source is an extension, lookup the display name.
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
-    ExtensionService* ext_service = profile_->GetExtensionService();
-    if (ext_service) {
-      const Extension* extension = ext_service->GetExtensionByURL(origin);
+    ExtensionService* extension_service = profile_->GetExtensionService();
+    if (extension_service) {
+      const Extension* extension =
+          extension_service->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(
+                  WebSecurityOrigin::createFromString(
+                      UTF8ToUTF16(origin.spec())),
+                  origin));
       if (extension)
         return UTF8ToUTF16(extension->name());
     }
diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc
index 0ccb66b..94276fb 100644
--- a/chrome/browser/notifications/notification_options_menu_model.cc
+++ b/chrome/browser/notifications/notification_options_menu_model.cc
@@ -117,9 +117,11 @@ NotificationOptionsMenuModel::NotificationOptionsMenuModel(Balloon* balloon)
   const GURL& origin = notification.origin_url();
 
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
-    ExtensionService* ext_service =
+    ExtensionService* extension_service =
         balloon_->profile()->GetExtensionService();
-    const Extension* extension = ext_service->GetExtensionByURL(origin);
+    const Extension* extension =
+        extension_service->extensions()->GetExtensionOrAppByURL(
+            ExtensionURLInfo(origin));
     // We get back no extension here when we show the notification after
     // the extension has crashed.
     if (extension) {
@@ -165,12 +167,14 @@ string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)
     DesktopNotificationService* service =
         DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
     if (origin.SchemeIs(chrome::kExtensionScheme)) {
-      ExtensionService* ext_service =
+      ExtensionService* extension_service =
           balloon_->profile()->GetExtensionService();
-      const Extension* extension = ext_service->GetExtensionByURL(origin);
+      const Extension* extension =
+          extension_service->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(origin));
       if (extension) {
         return l10n_util::GetStringUTF16(
-            ext_service->IsExtensionEnabled(extension->id()) ?
+            extension_service->IsExtensionEnabled(extension->id()) ?
                 IDS_EXTENSIONS_DISABLE :
                 IDS_EXTENSIONS_ENABLE);
       }
@@ -212,7 +216,7 @@ bool NotificationOptionsMenuModel::GetAcceleratorForCommandId(
 void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
-  ExtensionService* ext_service =
+  ExtensionService* extension_service =
       balloon_->profile()->GetExtensionService();
   const GURL& origin = balloon_->notification().origin_url();
   switch (command_id) {
@@ -223,13 +227,15 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
         service->GrantPermission(origin);
       break;
     case kToggleExtensionCommand: {
-      const Extension* extension = ext_service->GetExtensionByURL(origin);
+      const Extension* extension =
+          extension_service->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(origin));
       if (extension) {
         const std::string& id = extension->id();
-        if (ext_service->IsExtensionEnabled(id))
-          ext_service->DisableExtension(id);
+        if (extension_service->IsExtensionEnabled(id))
+          extension_service->DisableExtension(id);
         else
-          ext_service->EnableExtension(id);
+          extension_service->EnableExtension(id);
       }
       break;
     }
diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
index 6ce517d..8f1f1f1 100644
--- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
+++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
@@ -152,7 +152,7 @@ const Extension* ChromeRenderViewHostObserver::GetExtension() {
 
   // May be null if the extension doesn't exist, for example if somebody typos
   // a chrome-extension:// URL.
-  return service->GetExtensionByURL(site);
+  return service->extensions()->GetByID(site.host());
 }
 
 void ChromeRenderViewHostObserver::RemoveRenderViewHostForExtensions(
diff --git a/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc b/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc
index 6d82b32..350ed4c 100644
--- a/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc
+++ b/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc
@@ -22,7 +22,8 @@ namespace {
 const Extension* GetNonBookmarkAppExtension(
     const ExtensionSet& extensions, const GURL& url) {
   // Exclude bookmark apps, which do not use the app process model.
-  const Extension* extension = extensions.GetByURL(ExtensionURLInfo(url));
+  const Extension* extension = extensions.GetExtensionOrAppByURL(
+      ExtensionURLInfo(url));
   if (extension && extension->from_bookmark())
     extension = NULL;
   return extension;
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 0946340..a3f89c6 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -102,7 +102,8 @@ RenderViewHostDelegateViewHelper::MaybeCreateBackgroundContents(
   // permission as that is checked in RenderMessageFilter when the CreateWindow
   // message is processed.
   const Extension* extension =
-      extensions_service->GetExtensionByWebExtent(opener_url);
+      extensions_service->extensions()->GetHostedAppByURL(
+          ExtensionURLInfo(opener_url));
   if (!extension)
     return NULL;
 
@@ -551,8 +552,8 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
 
   ExtensionService* service = profile->GetExtensionService();
   if (service) {
-    const Extension* extension =
-        service->GetExtensionByURL(rvh->site_instance()->site());
+    const Extension* extension = service->extensions()->GetByID(
+        rvh->site_instance()->site().host());
     extension_webkit_preferences::SetPreferences(
         extension, rvh->delegate()->GetRenderViewType(), &web_prefs);
   }
diff --git a/chrome/browser/tab_contents/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc
index 9cfa82e..58b7fb7 100644
--- a/chrome/browser/tab_contents/tab_util.cc
+++ b/chrome/browser/tab_contents/tab_util.cc
@@ -32,7 +32,8 @@ SiteInstance* GetSiteInstanceForNewTab(TabContents* source_contents,
   // as part of creating the tab.
   ExtensionService* service = profile->GetExtensionService();
   if (ChromeWebUIFactory::GetInstance()->UseWebUIForURL(profile, url) ||
-      (service && service->GetExtensionByWebExtent(url))) {
+      (service &&
+       service->extensions()->GetHostedAppByURL(ExtensionURLInfo(url)))) {
     return SiteInstance::CreateSiteInstanceForURL(profile, url);
   }
 
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 44fbf52..59f0a6e 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -329,8 +329,8 @@ const Extension* TaskManagerTabContentsResource::GetExtension() const {
   if (HostsExtension()) {
     ExtensionService* extension_service =
         tab_contents_->profile()->GetExtensionService();
-    return extension_service->GetExtensionByURL(
-        tab_contents_->tab_contents()->GetURL());
+    return extension_service->extensions()->GetByID(
+        tab_contents_->tab_contents()->GetURL().host());
   }
 
   return NULL;
diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h
index 0d4f1b8..6a58abc 100644
--- a/chrome/common/extensions/extension_messages.h
+++ b/chrome/common/extensions/extension_messages.h
@@ -33,9 +33,12 @@ IPC_STRUCT_BEGIN(ExtensionHostMsg_Request_Params)
   // URL of the frame the request was sent from. This isn't necessarily an
   // extension url. Extension requests can also originate from content scripts,
   // in which case extension_id will indicate the ID of the associated
-  // extension. Or, they can origiante from hosted apps or normal web pages.
+  // extension. Or, they can originate from hosted apps or normal web pages.
   IPC_STRUCT_MEMBER(GURL, source_url)
 
+  // Web security origin of the frame the request was sent from.
+  IPC_STRUCT_MEMBER(string16, source_origin)
+
   // Unique request id to match requests and responses.
   IPC_STRUCT_MEMBER(int, request_id)
 
diff --git a/chrome/common/extensions/extension_set.cc b/chrome/common/extensions/extension_set.cc
index c99220b..d6d18f7 100644
--- a/chrome/common/extensions/extension_set.cc
+++ b/chrome/common/extensions/extension_set.cc
@@ -49,20 +49,22 @@ void ExtensionSet::Clear() {
   extensions_.clear();
 }
 
-std::string ExtensionSet::GetIDByURL(const ExtensionURLInfo& info) const {
+std::string ExtensionSet::GetExtensionOrAppIDByURL(
+    const ExtensionURLInfo& info) const {
   DCHECK(!info.origin().isNull());
 
   if (info.url().SchemeIs(chrome::kExtensionScheme))
     return info.origin().isUnique() ? "" : info.url().host();
 
-  const Extension* extension = GetByURL(info);
+  const Extension* extension = GetExtensionOrAppByURL(info);
   if (!extension)
     return "";
 
   return extension->id();
 }
 
-const Extension* ExtensionSet::GetByURL(const ExtensionURLInfo& info) const {
+const Extension* ExtensionSet::GetExtensionOrAppByURL(
+    const ExtensionURLInfo& info) const {
   // In the common case, the document's origin will correspond to its URL,
   // but in some rare cases involving sandboxing, the two will be different.
   // We catch those cases by checking whether the document's origin is unique.
@@ -74,10 +76,26 @@ const Extension* ExtensionSet::GetByURL(const ExtensionURLInfo& info) const {
   if (info.url().SchemeIs(chrome::kExtensionScheme))
     return GetByID(info.url().host());
 
-  ExtensionMap::const_iterator i = extensions_.begin();
-  for (; i != extensions_.end(); ++i) {
-    if (i->second->web_extent().MatchesURL(info.url()))
-      return i->second.get();
+  return GetHostedAppByURL(info);
+}
+
+const Extension* ExtensionSet::GetHostedAppByURL(
+    const ExtensionURLInfo& info) const {
+  for (ExtensionMap::const_iterator iter = extensions_.begin();
+       iter != extensions_.end(); ++iter) {
+    if (iter->second->web_extent().MatchesURL(info.url()))
+      return iter->second.get();
+  }
+
+  return NULL;
+}
+
+const Extension* ExtensionSet::GetHostedAppByOverlappingWebExtent(
+    const URLPatternSet& extent) const {
+  for (ExtensionMap::const_iterator iter = extensions_.begin();
+       iter != extensions_.end(); ++iter) {
+    if (iter->second->web_extent().OverlapsWith(extent))
+      return iter->second.get();
   }
 
   return NULL;
@@ -85,8 +103,8 @@ const Extension* ExtensionSet::GetByURL(const ExtensionURLInfo& info) const {
 
 bool ExtensionSet::InSameExtent(const GURL& old_url,
                                 const GURL& new_url) const {
-  return GetByURL(ExtensionURLInfo(old_url)) ==
-      GetByURL(ExtensionURLInfo(new_url));
+  return GetExtensionOrAppByURL(ExtensionURLInfo(old_url)) ==
+      GetExtensionOrAppByURL(ExtensionURLInfo(new_url));
 }
 
 const Extension* ExtensionSet::GetByID(const std::string& id) const {
diff --git a/chrome/common/extensions/extension_set.h b/chrome/common/extensions/extension_set.h
index 3407557..87edae1 100644
--- a/chrome/common/extensions/extension_set.h
+++ b/chrome/common/extensions/extension_set.h
@@ -93,14 +93,22 @@ class ExtensionSet {
 
   // Returns the extension ID, or empty if none. This includes web URLs that
   // are part of an extension's web extent.
-  std::string GetIDByURL(const ExtensionURLInfo& info) const;
+  std::string GetExtensionOrAppIDByURL(const ExtensionURLInfo& info) const;
 
   // Returns the Extension, or NULL if none.  This includes web URLs that are
   // part of an extension's web extent.
   // NOTE: This can return NULL if called before UpdateExtensions receives
   // bulk extension data (e.g. if called from
   // EventBindings::HandleContextCreated)
-  const Extension* GetByURL(const ExtensionURLInfo& info) const;
+  const Extension* GetExtensionOrAppByURL(const ExtensionURLInfo& info) const;
+
+  // Returns the hosted app whose web extent contains the URL.
+  const Extension* GetHostedAppByURL(const ExtensionURLInfo& info) const;
+
+  // Returns a hosted app that contains any URL that overlaps with the given
+  // extent, if one exists.
+  const Extension* GetHostedAppByOverlappingWebExtent(
+      const URLPatternSet& extent) const;
 
   // Returns true if |new_url| is in the extent of the same extension as
   // |old_url|.  Also returns true if neither URL is in an app.
diff --git a/chrome/common/extensions/extension_set_unittest.cc b/chrome/common/extensions/extension_set_unittest.cc
index d41d999..56f2b5f 100644
--- a/chrome/common/extensions/extension_set_unittest.cc
+++ b/chrome/common/extensions/extension_set_unittest.cc
@@ -79,19 +79,19 @@ TEST(ExtensionSetTest, ExtensionSet) {
   EXPECT_EQ(3u, extensions.size());
 
   // Get extension by its chrome-extension:// URL
-  EXPECT_EQ(ext2, extensions.GetByURL(
+  EXPECT_EQ(ext2, extensions.GetExtensionOrAppByURL(
       ExtensionURLInfo(ext2->GetResourceURL("test.html"))));
-  EXPECT_EQ(ext3, extensions.GetByURL(
+  EXPECT_EQ(ext3, extensions.GetExtensionOrAppByURL(
       ExtensionURLInfo(ext3->GetResourceURL("test.html"))));
-  EXPECT_EQ(ext4, extensions.GetByURL(
+  EXPECT_EQ(ext4, extensions.GetExtensionOrAppByURL(
       ExtensionURLInfo(ext4->GetResourceURL("test.html"))));
 
   // Get extension by web extent.
-  EXPECT_EQ(ext2, extensions.GetByURL(
+  EXPECT_EQ(ext2, extensions.GetExtensionOrAppByURL(
       ExtensionURLInfo(GURL("http://code.google.com/p/chromium/monkey"))));
-  EXPECT_EQ(ext3, extensions.GetByURL(
+  EXPECT_EQ(ext3, extensions.GetExtensionOrAppByURL(
       ExtensionURLInfo(GURL("http://dev.chromium.org/design-docs/"))));
-  EXPECT_FALSE(extensions.GetByURL(
+  EXPECT_FALSE(extensions.GetExtensionOrAppByURL(
       ExtensionURLInfo(GURL("http://blog.chromium.org/"))));
 
   // Test InSameExtent().
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index a3f8bf2..745bcfc 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -474,7 +474,7 @@ bool ChromeContentRendererClient::IsNaClAllowed(
 
   // Determine if the manifest URL is part of an extension.
   const Extension* extension =
-      extension_dispatcher_->extensions()->GetByURL(
+      extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
           ExtensionURLInfo(manifest_url));
   // Only component, unpacked, and Chrome Web Store extensions are allowed.
   bool allowed_extension = extension &&
@@ -548,7 +548,7 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
       EqualsASCII(failed_request.httpMethod(), "POST");
 
   if (failed_url.is_valid() && !failed_url.SchemeIs(chrome::kExtensionScheme)) {
-    extension = extension_dispatcher_->extensions()->GetByURL(
+    extension = extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
         ExtensionURLInfo(failed_url));
   }
 
@@ -617,7 +617,8 @@ bool ChromeContentRendererClient::ShouldFork(WebFrame* frame,
 
     if (is_content_initiated) {
       const Extension* extension =
-          extension_dispatcher_->extensions()->GetByURL(ExtensionURLInfo(url));
+          extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(url));
       if (extension && extension->is_app()) {
         UMA_HISTOGRAM_ENUMERATION(
             extension_misc::kAppLaunchHistogram,
@@ -734,7 +735,8 @@ void ChromeContentRendererClient::SetExtensionDispatcher(
 const Extension* ChromeContentRendererClient::GetNonBookmarkAppExtension(
     const ExtensionSet* extensions, const GURL& url) {
   // Exclude bookmark apps, which do not use the app process model.
-  const Extension* extension = extensions->GetByURL(ExtensionURLInfo(url));
+  const Extension* extension = extensions->GetExtensionOrAppByURL(
+      ExtensionURLInfo(url));
   if (extension && extension->from_bookmark())
     extension = NULL;
   return extension;
@@ -760,7 +762,7 @@ bool ChromeContentRendererClient::CrossesExtensionExtents(
     WebDocument opener_document = frame->opener()->document();
     GURL opener_url = opener_document.url();
     WebSecurityOrigin opener_origin = opener_document.securityOrigin();
-    bool opener_is_extension_url = !!extensions->GetByURL(
+    bool opener_is_extension_url = !!extensions->GetExtensionOrAppByURL(
         ExtensionURLInfo(opener_origin, opener_url));
     WebSecurityOrigin opener = frame->opener()->document().securityOrigin();
     if (!new_url_extension &&
diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
index 2b3faab..e502ce65 100644
--- a/chrome/renderer/extensions/app_bindings.cc
+++ b/chrome/renderer/extensions/app_bindings.cc
@@ -188,9 +188,10 @@ v8::Handle<v8::Value> AppBindingsHandler::GetDetailsForFrame(
 
 v8::Handle<v8::Value> AppBindingsHandler::GetDetailsForFrameImpl(
     WebFrame* frame) {
-  const ::Extension* extension = dispatcher_->extensions()->GetByURL(
-      ExtensionURLInfo(frame->document().securityOrigin(),
-                       frame->document().url()));
+  const ::Extension* extension =
+      dispatcher_->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(
+          frame->document().securityOrigin(),
+          frame->document().url()));
   if (!extension)
     return v8::Null();
 
diff --git a/chrome/renderer/extensions/chrome_v8_extension.cc b/chrome/renderer/extensions/chrome_v8_extension.cc
index 6b5f6ba..35b5153 100644
--- a/chrome/renderer/extensions/chrome_v8_extension.cc
+++ b/chrome/renderer/extensions/chrome_v8_extension.cc
@@ -111,7 +111,7 @@ const Extension* ChromeV8Extension::GetExtensionForCurrentRenderView() const {
       ExtensionURLInfo(document.securityOrigin(), url)))
     return NULL;
 
-  return extensions->GetByURL(
+  return extensions->GetExtensionOrAppByURL(
       ExtensionURLInfo(document.securityOrigin(), url));
 }
 
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index c33b488..9990b99 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -293,8 +293,8 @@ void ExtensionDispatcher::DidCreateScriptContext(
     extension_id = user_script_slave_->GetExtensionIdForIsolatedWorld(world_id);
   } else {
     GURL frame_url = UserScriptSlave::GetDataSourceURLForFrame(frame);
-    extension_id = extensions_.GetIDByURL(
-      ExtensionURLInfo(frame->document().securityOrigin(), frame_url));
+    extension_id = extensions_.GetExtensionOrAppIDByURL(
+        ExtensionURLInfo(frame->document().securityOrigin(), frame_url));
   }
 
   ChromeV8Context* context =
diff --git a/chrome/renderer/extensions/extension_resource_request_policy.cc b/chrome/renderer/extensions/extension_resource_request_policy.cc
index 9d1d0d0..1649f92 100644
--- a/chrome/renderer/extensions/extension_resource_request_policy.cc
+++ b/chrome/renderer/extensions/extension_resource_request_policy.cc
@@ -18,7 +18,7 @@ bool ExtensionResourceRequestPolicy::CanRequestResource(
   CHECK(resource_url.SchemeIs(chrome::kExtensionScheme));
 
   const Extension* extension =
-      loaded_extensions->GetByURL(ExtensionURLInfo(resource_url));
+      loaded_extensions->GetExtensionOrAppByURL(ExtensionURLInfo(resource_url));
   if (!extension) {
     // Allow the load in the case of a non-existent extension. We'll just get a
     // 404 from the browser process.
diff --git a/chrome/renderer/extensions/schema_generated_bindings.cc b/chrome/renderer/extensions/schema_generated_bindings.cc
index fcd58b6..ea103fd 100644
--- a/chrome/renderer/extensions/schema_generated_bindings.cc
+++ b/chrome/renderer/extensions/schema_generated_bindings.cc
@@ -45,6 +45,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlob.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -55,6 +56,7 @@
 using content::V8ValueConverter;
 using extensions::ExtensionAPI;
 using WebKit::WebFrame;
+using WebKit::WebSecurityOrigin;
 using WebKit::WebView;
 
 namespace {
@@ -501,9 +503,12 @@ class ExtensionImpl : public ChromeV8Extension {
       return v8::Undefined();
 
     GURL source_url;
+    WebSecurityOrigin source_origin;
     WebFrame* webframe = current_context->web_frame();
-    if (webframe)
+    if (webframe) {
       source_url = webframe->document().url();
+      source_origin = webframe->document().securityOrigin();
+    }
 
     int request_id = args[2]->Int32Value();
     bool has_callback = args[3]->BooleanValue();
@@ -520,6 +525,7 @@ class ExtensionImpl : public ChromeV8Extension {
     params.arguments.Swap(value_args);
     params.extension_id = current_context->extension_id();
     params.source_url = source_url;
+    params.source_origin = source_origin.toString();
     params.request_id = request_id;
     params.has_callback = has_callback;
     params.user_gesture =