Apps&Extensions for supervised users: Allow the custodian to remotely uninstall extensions.

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"
@@ skipping 63 matching lines @@
     return;
 
   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) {
+    // If the new app was installed by the custodian, also use custodian
+    // privileges for removing the old one.
+    extensions::UninstallReason reason =
+        new_app->was_installed_by_custodian() ?
+            extensions::UNINSTALL_REASON_SYNC_BY_CUSTODIAN :
+            extensions::UNINSTALL_REASON_SYNC;
+
     extensions::ExtensionSystem::Get(profile_)
         ->extension_service()
-        ->UninstallExtension(
-            existing_chrome_app_id, extensions::UNINSTALL_REASON_SYNC, NULL);
+        ->UninstallExtension(existing_chrome_app_id, reason, 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 86 matching lines @@
 
   if (chrome_app_id.empty() || !is_generated)
     return;
 
   const Extension* existing_app =
       ExtensionRegistry::Get(profile_)
           ->GetExtensionById(chrome_app_id, ExtensionRegistry::EVERYTHING);
   if (!existing_app)
     return;
 
+  extensions::UninstallReason reason =
+      existing_app->was_installed_by_custodian() ?
+          extensions::UNINSTALL_REASON_SYNC_BY_CUSTODIAN :
+          extensions::UNINSTALL_REASON_SYNC;
   extensions::ExtensionSystem::Get(profile_)
       ->extension_service()
-      ->UninstallExtension(
-          chrome_app_id, extensions::UNINSTALL_REASON_SYNC, NULL);
+      ->UninstallExtension(chrome_app_id, reason, 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 51 matching lines @@
     content::BrowserContext* browser_context,
     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));
 }