Add "UninstallReason" parameter to ExtensionRegistryObserver::OnExtensionUninstalled.

chrome/browser/ui/webui/ntp/app_launcher_handler.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/webui/ntp/app_launcher_handler.h"
 
 #include <vector>
 
 #include "apps/metrics_names.h"
 #include "base/auto_reset.h"
@@ skipping 51 matching lines @@
 #include "ui/base/webui/web_ui_util.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 using extensions::AppSorting;
 using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSet;
+using extensions::UninstalledExtensionInfo;
 using extensions::UnloadedExtensionInfo;
 
 namespace {
 
 void RecordAppLauncherPromoHistogram(
       apps::AppLauncherPromoHistogramValues value) {
   DCHECK_LT(value, apps::APP_LAUNCHER_PROMO_MAX);
   UMA_HISTOGRAM_ENUMERATION(
       "Apps.AppLauncherPromo", value, apps::APP_LAUNCHER_PROMO_MAX);
 }
@@ skipping 197 matching lines @@
             "ntp.appAdded", *app_info, *highlight);
       }
 
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
     case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: {
       const Extension* extension = NULL;
       bool uninstalled = false;
       if (type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED) {
-        extension = content::Details<const Extension>(details).ptr();
+        extension = content::Details<extensions::UninstalledExtensionInfo>(
+                        details)->extension;
         uninstalled = true;
       } else {  // NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED
         if (content::Details<UnloadedExtensionInfo>(details)->reason ==
             UnloadedExtensionInfo::REASON_UNINSTALL) {
           // Uninstalls are tracked by
           // NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED.
           return;
         }
         extension = content::Details<extensions::UnloadedExtensionInfo>(
             details)->extension;
@@ skipping 487 matching lines @@
 
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* extension =
       extension_service_->GetInstalledExtension(extension_id_prompting_);
   if (!extension)
     return;
 
   extension_service_->UninstallExtension(
       extension_id_prompting_,
-      ExtensionService::UNINSTALL_REASON_USER_INITIATED,
+      UninstalledExtensionInfo::REASON_USER_INITIATED,
       NULL);
   CleanupAfterUninstall();
 }
 
 void AppLauncherHandler::ExtensionUninstallCanceled() {
   CleanupAfterUninstall();
 }
 
 void AppLauncherHandler::ExtensionEnableFlowFinished() {
   DCHECK_EQ(extension_id_prompting_, extension_enable_flow_->extension_id());
@@ skipping 30 matching lines @@
 AppLauncherHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     Browser* browser = chrome::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_uninstall_dialog_.reset(
         extensions::ExtensionUninstallDialog::Create(
             extension_service_->profile(), browser, this));
   }
   return extension_uninstall_dialog_.get();
 }