Add "UninstallReason" parameter to ExtensionRegistryObserver::OnExtensionUninstalled.

chrome/browser/apps/ephemeral_app_service.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/apps/ephemeral_app_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
+#include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSet;
 using extensions::ExtensionSystem;
 
 namespace {
@@ skipping 63 matching lines @@
       continue;
 
     // Do not remove apps that are running.
     if (!extensions::util::IsExtensionIdle(extension_id, profile_))
       continue;
 
     DCHECK(registry->GetExtensionById(extension_id,
                                       ExtensionRegistry::EVERYTHING));
     service->UninstallExtension(
         extension_id,
-        ExtensionService::UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION,
+        extensions::UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION,
         NULL);
   }
 }
 
 void EphemeralAppService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSIONS_READY: {
@@ skipping 25 matching lines @@
     ++ephemeral_app_count_;
     if (ephemeral_app_count_ >= kGarbageCollectAppsTriggerCount) {
       TriggerGarbageCollect(
           base::TimeDelta::FromSeconds(kGarbageCollectAppsInstallDelay));
     }
   }
 }
 
 void EphemeralAppService::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
-    const extensions::Extension* extension) {
+    const extensions::Extension* extension,
+    extensions::UninstallReason reason) {
   if (extensions::util::IsEphemeralApp(extension->id(), profile_)) {
     --ephemeral_app_count_;
     DCHECK_GE(ephemeral_app_count_, 0);
   }
 }
 
 void EphemeralAppService::Init() {
   InitEphemeralAppCount();
   TriggerGarbageCollect(
       base::TimeDelta::FromSeconds(kGarbageCollectAppsStartupDelay));
@@ skipping 68 matching lines @@
   if (!app_launch_times.empty()) {
     GetAppsToRemove(app_count, app_launch_times, &remove_app_ids);
 
     for (std::set<std::string>::const_iterator id = remove_app_ids.begin();
          id != remove_app_ids.end(); ++id) {
       // Protect against cascading uninstalls.
       if (!registry->GetExtensionById(*id, ExtensionRegistry::EVERYTHING))
         continue;
 
       service->UninstallExtension(
-          *id,
-          ExtensionService::UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION,
-          NULL);
+          *id, extensions::UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION, NULL);
     }
   }
 }
 
 // static
 void EphemeralAppService::GetAppsToRemove(
     int app_count,
     const LaunchTimeAppMap& app_launch_times,
     std::set<std::string>* remove_app_ids) {
   base::Time time_now = base::Time::Now();
@@ skipping 13 matching lines @@
     // Remove ephemeral apps that have been inactive for a while or if the cache
     // is larger than the desired size.
     if (it->first < inactive_threshold || app_count > kMaxEphemeralAppsCount) {
       remove_app_ids->insert(it->second);
       --app_count;
     } else {
       break;
     }
   }
 }