Move ExtensionService::GetExtensionById() to ExtensionRegistry

chrome/browser/extensions/extension_util.cc

 // Copyright 2013 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/extensions/extension_util.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "content/public/browser/site_instance.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
+using extensions::ExtensionRegistry;
 
 namespace extension_util {
 
 bool IsIncognitoEnabled(const std::string& extension_id,
                         const ExtensionService* service) {
   if (!service)
     return false;
 
   const Extension* extension = service->GetInstalledExtension(extension_id);
   if (extension && !extension->can_be_incognito_enabled())
@@ skipping 96 matching lines @@
 }
 
 bool IsAppLaunchable(const std::string& extension_id,
                      const ExtensionService* service) {
   return !(service->extension_prefs()->GetDisableReasons(extension_id) &
            Extension::DISABLE_UNSUPPORTED_REQUIREMENT);
 }
 
 bool IsAppLaunchableWithoutEnabling(const std::string& extension_id,
                                     const ExtensionService* service) {
-  const Extension* launchable_extension = service->GetExtensionById(
-      extension_id, ExtensionService::INCLUDE_ENABLED);
+  ExtensionRegistry* registry =
+      ExtensionRegistry::Get(service->GetBrowserContext());
+  const Extension* launchable_extension = registry->GetExtensionById(
+      extension_id, ExtensionRegistry::INCLUDE_ENABLED);
   return launchable_extension != NULL;
 }
 
 bool IsExtensionIdle(const std::string& extension_id,
                      extensions::ExtensionSystem* extension_system) {
   DCHECK(extension_system);
   extensions::ProcessManager* process_manager =
       extension_system->process_manager();
   DCHECK(process_manager);
   extensions::ExtensionHost* host =
       process_manager->GetBackgroundHostForExtension(extension_id);
   if (host)
     return false;
 
   content::SiteInstance* site_instance = process_manager->GetSiteInstanceForURL(
       Extension::GetBaseURLFromExtensionId(extension_id));
   if (site_instance && site_instance->HasProcess()) {
     return false;
   }
 
   return process_manager->GetRenderViewHostsForExtension(extension_id).empty();
 }
 
 }  // namespace extension_util