Revert 95009. Causing pyauto NTP test failures on all platforms.

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
===================================================================
--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc	(revision 95021)
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc	(working copy)
@@ -74,7 +74,7 @@
 }  // namespace
 
 AppLauncherHandler::AppLauncherHandler(ExtensionService* extension_service)
-    : extension_service_(extension_service),
+    : extensions_service_(extension_service),
       promo_active_(false),
       ignore_changes_(false) {
 }
@@ -96,23 +96,11 @@
 }
 
 // static
-DictionaryValue* AppLauncherHandler::CreateAppInfo(
-    const Extension* extension,
-    const AppNotification* notification,
-    ExtensionService* service) {
-  // Don't include the WebStore and the Cloud Print app.
-  // The WebStore launcher gets special treatment in ntp/apps.js.
-  // The Cloud Print app should never be displayed in the NTP.
-  bool ntp3 =
-      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
-  if (!extension->is_app() ||
-      (ntp3 && extension->id() == extension_misc::kWebStoreAppId) ||
-      (extension->id() == extension_misc::kCloudPrintAppId)) {
-    return NULL;
-  }
-
-  bool enabled = service->IsExtensionEnabled(extension->id()) &&
-      !service->GetTerminatedExtension(extension->id());
+void AppLauncherHandler::CreateAppInfo(const Extension* extension,
+                                       const AppNotification* notification,
+                                       ExtensionService* service,
+                                       DictionaryValue* value) {
+  bool enabled = service->IsExtensionEnabled(extension->id());
   GURL icon_big =
       ExtensionIconSource::GetIconURL(extension,
                                       Extension::EXTENSION_ICON_LARGE,
@@ -124,7 +112,6 @@
                                       ExtensionIconSet::MATCH_BIGGER,
                                       !enabled);
 
-  DictionaryValue* value = new DictionaryValue();
   value->Clear();
   value->SetString("id", extension->id());
   value->SetString("name", extension->name());
@@ -160,7 +147,6 @@
     // Only provide a value if one is stored
     value->SetInteger("page_index", page_index);
   }
-  return value;
 }
 
 // static
@@ -244,7 +230,7 @@
     case chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED: {
       const std::string& id = *Details<const std::string>(details).ptr();
       const AppNotification* notification =
-          extension_service_->app_notification_manager()->GetLast(id);
+          extensions_service_->app_notification_manager()->GetLast(id);
       ListValue args;
       args.Append(new StringValue(id));
       if (notification)
@@ -305,32 +291,34 @@
 
 void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
   ListValue* list = new ListValue();
-  const ExtensionList* extensions = extension_service_->extensions();
+  const ExtensionList* extensions = extensions_service_->extensions();
   ExtensionList::const_iterator it;
   for (it = extensions->begin(); it != extensions->end(); ++it) {
-    DictionaryValue* app_info = GetAppInfo(*it);
+    // Don't include the WebStore and the Cloud Print app.
+    // The WebStore launcher gets special treatment in ntp/apps.js.
+    // The Cloud Print app should never be displayed in the NTP.
+    const Extension* extension = *it;
+    DictionaryValue* app_info = GetAppInfo(extension);
     if (app_info)
       list->Append(app_info);
   }
 
-  extensions = extension_service_->disabled_extensions();
+  extensions = extensions_service_->disabled_extensions();
   for (it = extensions->begin(); it != extensions->end(); ++it) {
-    DictionaryValue* app_info = CreateAppInfo(*it,
-                                              NULL,
-                                              extension_service_);
-    if (app_info)
+    bool ntp3 =
+        !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
+    if ((*it)->is_app() &&
+        !(ntp3 && (*it)->id() == extension_misc::kWebStoreAppId) &&
+        ((*it)->id() != extension_misc::kCloudPrintAppId)) {
+      DictionaryValue* app_info = new DictionaryValue();
+      CreateAppInfo(*it,
+                    NULL,
+                    extensions_service_,
+                    app_info);
       list->Append(app_info);
+    }
   }
 
-  extensions = extension_service_->terminated_extensions();
-  for (it = extensions->begin(); it != extensions->end(); ++it) {
-    DictionaryValue* app_info = CreateAppInfo(*it,
-                                              NULL,
-                                              extension_service_);
-    if (app_info)
-      list->Append(app_info);
-  }
-
   dictionary->Set("apps", list);
 
   // TODO(estade): remove these settings when the old NTP is removed. The new
@@ -349,8 +337,8 @@
 
   dictionary->SetBoolean(
       "showLauncher",
-      extension_service_->apps_promo()->ShouldShowAppLauncher(
-          extension_service_->GetAppIds()));
+      extensions_service_->apps_promo()->ShouldShowAppLauncher(
+          extensions_service_->GetAppIds()));
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
     PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
@@ -363,11 +351,22 @@
 }
 
 DictionaryValue* AppLauncherHandler::GetAppInfo(const Extension* extension) {
+  bool ntp3 =
+      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
+  if (!extension->is_app() ||
+      (ntp3 && extension->id() == extension_misc::kWebStoreAppId) ||
+      (extension->id() == extension_misc::kCloudPrintAppId)) {
+    return NULL;
+  }
+
+  DictionaryValue* app_info = new DictionaryValue();
   AppNotificationManager* notification_manager =
-      extension_service_->app_notification_manager();
-  return CreateAppInfo(extension,
-                       notification_manager->GetLast(extension->id()),
-                       extension_service_);
+      extensions_service_->app_notification_manager();
+  CreateAppInfo(extension,
+                notification_manager->GetLast(extension->id()),
+                extensions_service_,
+                app_info);
+  return app_info;
 }
 
 void AppLauncherHandler::FillPromoDictionary(DictionaryValue* dictionary) {
@@ -389,10 +388,10 @@
   //    expired.
   // b) Conceptually, it doesn't really make sense to count a
   //    prefchange-triggered refresh as a promo 'view'.
-  AppsPromo* apps_promo = extension_service_->apps_promo();
+  AppsPromo* apps_promo = extensions_service_->apps_promo();
   PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
   bool apps_promo_just_expired = false;
-  if (apps_promo->ShouldShowPromo(extension_service_->GetAppIds(),
+  if (apps_promo->ShouldShowPromo(extensions_service_->GetAppIds(),
                                   &apps_promo_just_expired)) {
     apps_promo->MaximizeAppsIfNecessary();
     dictionary.SetBoolean("showPromo", true);
@@ -431,7 +430,7 @@
   }
   if (pref_change_registrar_.IsEmpty()) {
     pref_change_registrar_.Init(
-        extension_service_->extension_prefs()->pref_service());
+        extensions_service_->extension_prefs()->pref_service());
     pref_change_registrar_.Add(ExtensionPrefs::kExtensionsPref, this);
     pref_change_registrar_.Add(prefs::kNTPAppPageNames, this);
   }
@@ -463,7 +462,7 @@
         launch_bucket < extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
 
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id, false);
+      extensions_service_->GetExtensionById(extension_id, false);
 
   // Prompt the user to re-enable the application if disabled.
   if (!extension) {
@@ -471,7 +470,7 @@
     return;
   }
 
-  Profile* profile = extension_service_->profile();
+  Profile* profile = extensions_service_->profile();
 
   // If the user pressed special keys when clicking, override the saved
   // preference for launch container.
@@ -482,7 +481,7 @@
 
   if (extension_id != extension_misc::kWebStoreAppId) {
     RecordAppLaunchByID(promo_active_, launch_bucket);
-    extension_service_->apps_promo()->ExpireDefaultApps();
+    extensions_service_->apps_promo()->ExpireDefaultApps();
   }
 
   if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) {
@@ -497,7 +496,7 @@
     // Look at preference to find the right launch container.  If no preference
     // is set, launch as a regular tab.
     extension_misc::LaunchContainer launch_container =
-        extension_service_->extension_prefs()->GetLaunchContainer(
+        extensions_service_->extension_prefs()->GetLaunchContainer(
             extension, ExtensionPrefs::LAUNCH_REGULAR);
 
     // To give a more "launchy" experience when using the NTP launcher, we close
@@ -524,7 +523,7 @@
   CHECK(args->GetDouble(1, &launch_type));
 
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id, true);
+      extensions_service_->GetExtensionById(extension_id, true);
   CHECK(extension);
 
   // Don't update the page; it already knows about the launch type change.
@@ -532,7 +531,7 @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
     auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
 
-  extension_service_->extension_prefs()->SetLaunchType(
+  extensions_service_->extension_prefs()->SetLaunchType(
       extension_id,
       static_cast<ExtensionPrefs::LaunchType>(
           static_cast<int>(launch_type)));
@@ -542,7 +541,7 @@
   std::string extension_id;
   CHECK(args->GetString(0, &extension_id));
 
-  const Extension* extension = extension_service_->GetExtensionById(
+  const Extension* extension = extensions_service_->GetExtensionById(
       extension_id, true);
   if (!extension)
     return;
@@ -574,7 +573,7 @@
   // this point, or the promotion wouldn't have been shown).
   ignore_changes_ = true;
   UninstallDefaultApps();
-  extension_service_->apps_promo()->HidePromo();
+  extensions_service_->apps_promo()->HidePromo();
   ignore_changes_ = false;
   HandleGetApps(NULL);
 }
@@ -587,7 +586,7 @@
   }
 
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id, true);
+      extensions_service_->GetExtensionById(extension_id, true);
   CHECK(extension);
 
   Browser* browser = BrowserList::GetLastActive();
@@ -617,8 +616,8 @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
     auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
 
-  extension_service_->extension_prefs()->SetAppDraggedByUser(dragged_app_id);
-  extension_service_->extension_prefs()->SetAppLauncherOrder(extension_ids);
+  extensions_service_->extension_prefs()->SetAppDraggedByUser(dragged_app_id);
+  extensions_service_->extension_prefs()->SetAppLauncherOrder(extension_ids);
 }
 
 void AppLauncherHandler::HandleSetPageIndex(const ListValue* args) {
@@ -632,7 +631,7 @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
     auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
 
-  extension_service_->extension_prefs()->SetPageIndex(extension_id,
+  extensions_service_->extension_prefs()->SetPageIndex(extension_id,
       static_cast<int>(page_index));
 }
 
@@ -680,7 +679,7 @@
   if (!favicon_service) {
     LOG(ERROR) << "No favicon service";
     scoped_refptr<CrxInstaller> installer(
-        extension_service_->MakeCrxInstaller(NULL));
+        extensions_service_->MakeCrxInstaller(NULL));
     installer->InstallWebApp(*web_app);
     return;
   }
@@ -706,7 +705,7 @@
   }
 
   scoped_refptr<CrxInstaller> installer(
-      extension_service_->MakeCrxInstaller(NULL));
+      extensions_service_->MakeCrxInstaller(NULL));
   installer->InstallWebApp(*web_app);
 }
 
@@ -763,24 +762,16 @@
 
 void AppLauncherHandler::PromptToEnableApp(const std::string& extension_id) {
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id, true);
-  if (!extension) {
-    extension = extension_service_->GetTerminatedExtension(extension_id);
-    CHECK(extension);
-    // If the app was terminated, reload it first. (This reallocates the
-    // Extension object.)
-    extension_service_->ReloadExtension(extension_id);
-    extension = extension_service_->GetExtensionById(extension_id, true);
-  }
+      extensions_service_->GetExtensionById(extension_id, true);
+  CHECK(extension);
 
-  ExtensionPrefs* extension_prefs = extension_service_->extension_prefs();
+  ExtensionPrefs* extension_prefs = extensions_service_->extension_prefs();
   if (!extension_prefs->DidExtensionEscalatePermissions(extension_id)) {
     // Enable the extension immediately if its privileges weren't escalated.
-    // This is a no-op if the extension was previously terminated.
-    extension_service_->EnableExtension(extension_id);
+    extensions_service_->EnableExtension(extension_id);
 
     // Launch app asynchronously so the image will update.
-    StringValue* app_id = Value::CreateStringValue(extension_id);
+    StringValue* app_id = Value::CreateStringValue(extension->id());
     web_ui_->CallJavascriptFunction("launchAppAfterEnable", *app_id);
     return;
   }
@@ -799,12 +790,12 @@
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id_prompting_, true);
+      extensions_service_->GetExtensionById(extension_id_prompting_, true);
   if (!extension)
     return;
 
-  extension_service_->UninstallExtension(extension_id_prompting_,
-                                         false /* external_uninstall */, NULL);
+  extensions_service_->UninstallExtension(extension_id_prompting_,
+                                          false /* external_uninstall */, NULL);
 
   extension_id_prompting_ = "";
 }
@@ -820,11 +811,11 @@
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id_prompting_, true);
+      extensions_service_->GetExtensionById(extension_id_prompting_, true);
   if (!extension)
     return;
 
-  extension_service_->GrantPermissionsAndEnableExtension(extension);
+  extensions_service_->GrantPermissionsAndEnableExtension(extension);
 
   // We bounce this off the NTP so the browser can update the apps icon.
   // If we don't launch the app asynchronously, then the app's disabled
@@ -840,7 +831,7 @@
   // We record the histograms here because ExtensionDialogCanceled is also
   // called when the extension uninstall dialog is canceled.
   const Extension* extension =
-      extension_service_->GetExtensionById(extension_id_prompting_, true);
+      extensions_service_->GetExtensionById(extension_id_prompting_, true);
   std::string histogram_name = user_initiated ?
       "Extensions.Permissions_ReEnableCancel" :
       "Extensions.Permissions_ReEnableAbort";
@@ -867,11 +858,11 @@
 }
 
 void AppLauncherHandler::UninstallDefaultApps() {
-  AppsPromo* apps_promo = extension_service_->apps_promo();
+  AppsPromo* apps_promo = extensions_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
-    if (extension_service_->GetExtensionById(*iter, true))
-      extension_service_->UninstallExtension(*iter, false, NULL);
+    if (extensions_service_->GetExtensionById(*iter, true))
+      extensions_service_->UninstallExtension(*iter, false, NULL);
   }
 }