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

chrome/browser/extensions/extension_process_manager.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 "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 
 #include "chrome/browser/ui/browser_window.h"
 #include "content/browser/browsing_instance.h"
@@ skipping 36 matching lines @@
   virtual void CreateBackgroundHost(const Extension* extension,
                                     const GURL& url);
   virtual SiteInstance* GetSiteInstanceForURL(const GURL& url);
 
  private:
   // content::NotificationObserver:
   virtual void Observe(int type,
                        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);
 
   ExtensionProcessManager* original_manager_;
 };
 
 static void CreateBackgroundHostForExtensionLoad(
     ExtensionProcessManager* manager, const Extension* extension) {
   // Start the process for the master page, if it exists and we're not lazy.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 68 matching lines @@
 
 ExtensionHost* ExtensionProcessManager::CreateViewHost(
     const GURL& url, Browser* browser, content::ViewType view_type) {
   // A NULL browser may only be given for pop-up views.
   DCHECK(browser ||
          (!browser && view_type == chrome::VIEW_TYPE_EXTENSION_POPUP));
   Profile* profile =
       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);
   }
   return NULL;
 }
 
 ExtensionHost* ExtensionProcessManager::CreatePopupHost(
     const Extension* extension, const GURL& url, Browser* browser) {
   return CreateViewHost(
       extension, url, browser, chrome::VIEW_TYPE_EXTENSION_POPUP);
@@ skipping 272 matching lines @@
     if (IsIncognitoEnabled(extension))
       ExtensionProcessManager::CreateBackgroundHost(extension, url);
   } else {
     // Do nothing. If an extension is spanning, then its original-profile
     // background page is shared with incognito, so we don't create another.
   }
 }
 
 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(
     const Extension* extension) {
   // Keep in sync with duplicate in extension_info_map.cc.
   Profile* profile =
       Profile::FromBrowserContext(browsing_instance_->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   return service && service->IsIncognitoEnabled(extension->id());
 }
@@ skipping 21 matching lines @@
         if (service && service->is_ready())
           CreateBackgroundHostsForProfileStartup(this, service->extensions());
       }
       break;
     }
     default:
       ExtensionProcessManager::Observe(type, source, details);
       break;
   }
 }