Fix for memory leak bug 89144.

chrome/browser/ui/webui/ntp/app_launcher_handler.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 "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 272 matching lines @@
 void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
   ListValue* list = new ListValue();
   const ExtensionList* extensions = extensions_service_->extensions();
   ExtensionList::const_iterator it;
   for (it = extensions->begin(); it != extensions->end(); ++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 && ((*it)->id() != extension_misc::kCloudPrintAppId))
+    if (app_info)
       list->Append(app_info);
   }
 
   extensions = extensions_service_->disabled_extensions();
   for (it = extensions->begin(); it != extensions->end(); ++it) {
     bool ntp3 =
         !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
     if ((*it)->is_app() &&
         !(ntp3 && (*it)->id() == extension_misc::kWebStoreAppId) &&
         ((*it)->id() != extension_misc::kCloudPrintAppId)) {
@@ skipping 34 matching lines @@
       dictionary->Set("appPageNames",
                       static_cast<ListValue*>(app_page_names->DeepCopy()));
     }
   }
 }
 
 DictionaryValue* AppLauncherHandler::GetAppInfo(const Extension* extension) {
   bool ntp3 =
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
   if (!extension->is_app() ||
-      (ntp3 && extension->id() == extension_misc::kWebStoreAppId)) {
+      (ntp3 && extension->id() == extension_misc::kWebStoreAppId) ||
+      (extension->id() == extension_misc::kCloudPrintAppId)) {
     return NULL;
   }
 
   DictionaryValue* app_info = new DictionaryValue();
   AppNotificationManager* notification_manager =
       extensions_service_->app_notification_manager();
   CreateAppInfo(extension,
                 notification_manager->GetLast(extension->id()),
                 extensions_service_,
                 app_info);
@@ skipping 425 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   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 (extensions_service_->GetExtensionById(*iter, true))
       extensions_service_->UninstallExtension(*iter, false, NULL);
   }
 }