Add "UninstallReason" parameter to ExtensionRegistryObserver::OnExtensionUninstalled.

chrome/browser/apps/drive/drive_app_provider.cc

 // Copyright 2014 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/drive/drive_app_provider.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/apps/drive/drive_app_converter.h"
 #include "chrome/browser/apps/drive/drive_app_mapping.h"
 #include "chrome/browser/apps/drive/drive_service_bridge.h"
 #include "chrome/browser/drive/drive_app_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_factory.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 
 using extensions::Extension;
 using extensions::ExtensionRegistry;
 
 namespace {
 
 void IgnoreUninstallResult(google_apis::GDataErrorCode) {
 }
 
@@ skipping 41 matching lines @@
   const bool is_existing_app_generated =
       mapping_->IsChromeAppGenerated(existing_chrome_app_id);
   mapping_->Add(drive_app_id, new_chrome_app_id, is_new_app_generated);
 
   const Extension* existing_app =
       ExtensionRegistry::Get(profile_)->GetExtensionById(
           existing_chrome_app_id, ExtensionRegistry::EVERYTHING);
   if (existing_app && is_existing_app_generated) {
     extensions::ExtensionSystem::Get(profile_)
         ->extension_service()
-        ->UninstallExtension(existing_chrome_app_id,
-                             ExtensionService::UNINSTALL_REASON_SYNC,
-                             NULL);
+        ->UninstallExtension(
+            existing_chrome_app_id, extensions::UNINSTALL_REASON_SYNC, NULL);
   }
 }
 
 void DriveAppProvider::ProcessDeferredOnExtensionInstalled(
     const std::string drive_app_id,
     const std::string chrome_app_id) {
   const Extension* app = ExtensionRegistry::Get(profile_)->GetExtensionById(
       chrome_app_id, ExtensionRegistry::EVERYTHING);
   if (!app)
     return;
@@ skipping 89 matching lines @@
 
   const Extension* existing_app =
       ExtensionRegistry::Get(profile_)
           ->GetExtensionById(chrome_app_id, ExtensionRegistry::EVERYTHING);
   if (!existing_app)
     return;
 
   extensions::ExtensionSystem::Get(profile_)
       ->extension_service()
       ->UninstallExtension(
-          chrome_app_id, ExtensionService::UNINSTALL_REASON_SYNC, NULL);
+          chrome_app_id, extensions::UNINSTALL_REASON_SYNC, NULL);
 }
 
 void DriveAppProvider::OnDriveAppRegistryUpdated() {
   service_bridge_->GetAppRegistry()->GetAppList(&drive_apps_);
 
   IdSet current_ids;
   for (size_t i = 0; i < drive_apps_.size(); ++i)
     current_ids.insert(drive_apps_[i].app_id);
 
   const IdSet existing_ids = mapping_->GetDriveAppIds();
@@ skipping 42 matching lines @@
                      weak_ptr_factory_.GetWeakPtr(),
                      drive_apps_[i].app_id,
                      extension->id()));
       return;
     }
   }
 }
 
 void DriveAppProvider::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
-    const Extension* extension) {
+    const Extension* extension,
+    extensions::UninstallReason reason) {
   std::string drive_app_id = mapping_->GetDriveApp(extension->id());
   if (drive_app_id.empty())
     return;
 
   service_bridge_->GetAppRegistry()->UninstallApp(
       drive_app_id, base::Bind(&IgnoreUninstallResult));
 }