Remove ExtensionService::[Get|Is]InstalledApp()

chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc

 // Copyright (c) 2012 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/ui/ash/launcher/launcher_app_tab_helper.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 namespace {
 
 const extensions::Extension* GetExtensionForTab(Profile* profile,
                                                 content::WebContents* tab) {
-  ExtensionService* extension_service = profile->GetExtensionService();
-  if (!extension_service || !extension_service->extensions_enabled())
+  if (!ExtensionSystem::Get(profile)->extension_service()->extensions_enabled())

[sky, 2014/04/04 21:21:13]

We seem to have all sorts of code that NULL checks
ExtensionSystem::Get(profile). Is that code wrong? Similar question on
extension_service().

[Devlin, 2014/04/04 21:24:14]

ExtensionService can be null (in unittests, more than anything else). 
ExtensionSystem and ExtensionRegistry should both always exist, even in
unittests.

     return NULL;
 
   Browser* browser = chrome::FindBrowserWithWebContents(tab);
   DCHECK(browser);
 
+  extensions::ExtensionRegistry* registry =
+      extensions::ExtensionRegistry::Get(profile);
+
   // Use the Browser's app name to determine the extension for app windows and
   // use the tab's url for app tabs.
   if (browser->is_app()) {
-    return extension_service->GetInstalledExtension(
-        web_app::GetExtensionIdFromApplicationName(browser->app_name()));
+    return registry->GetInstalledExtensionById(
+        web_app::GetExtensionIdFromApplicationName(browser->app_name()),
+        extensions::ExtensionRegistry::EVERYTHING);
   }
 
   const GURL url = tab->GetURL();
-  if (extension_service->IsInstalledApp(url))
-    return extension_service->GetInstalledApp(url);
+  const extensions::ExtensionSet& extensions = registry->enabled_extensions();
+  const Extension* extension = extensions.GetAppByURL(url);
+  if (extension)
+    return extension;
 
   // Bookmark app windows should match their launch url extension despite
   // their web extents.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableStreamlinedHostedApps)) {
-    const extensions::ExtensionSet& extensions =
-        extensions::ExtensionRegistry::Get(profile)->enabled_extensions();
     for (extensions::ExtensionSet::const_iterator it = extensions.begin();
          it != extensions.end(); ++it) {
       if (it->get()->from_bookmark() &&
           extensions::AppLaunchInfo::GetLaunchWebURL(it->get()) == url) {
         return it->get();
       }
     }
   }
   return NULL;
 }
@@ skipping 36 matching lines @@
   return extension ? extension->id() : std::string();
 }
 
 bool LauncherAppTabHelper::IsValidIDForCurrentUser(const std::string& id) {
   return GetExtensionByID(profile_, id) != NULL;
 }
 
 void LauncherAppTabHelper::SetCurrentUser(Profile* profile) {
   profile_ = profile;
 }