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

chrome/browser/extensions/extension_sync_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/extensions/extension_sync_service.h"
 
 #include <iterator>
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 432 matching lines @@
   const Extension* extension = extension_service_->GetInstalledExtension(id);
 
   // TODO(bolms): we should really handle this better.  The particularly bad
   // case is where an app becomes an extension or vice versa, and we end up with
   // a zombie extension that won't go away.
   if (extension && !IsCorrectSyncType(*extension, type))
     return true;
 
   // Handle uninstalls first.
   if (extension_sync_data.uninstalled()) {
+    extensions::UninstallReason reason =
+        extension_sync_data.installed_by_custodian() ?
+            extensions::UNINSTALL_REASON_SYNC_BY_CUSTODIAN :
+            extensions::UNINSTALL_REASON_SYNC;
     if (!extension_service_->UninstallExtensionHelper(
-            extension_service_, id, extensions::UNINSTALL_REASON_SYNC)) {
-      LOG(WARNING) << "Could not uninstall extension " << id
-                   << " for sync";
+            extension_service_, id, reason)) {
+      LOG(WARNING) << "Could not uninstall extension " << id << " for sync";
     }
     return true;
   }
 
   // Extension from sync was uninstalled by the user as external extensions.
   // Honor user choice and skip installation/enabling.
   if (extensions::ExtensionPrefs::Get(profile_)
           ->IsExternalExtensionUninstalled(id)) {
     LOG(WARNING) << "Extension with id " << id
                  << " from sync was uninstalled as external extension";
@@ skipping 82 matching lines @@
       app_sync_bundle_.SyncChangeIfNeeded(extension);
     else if (extension_service_->is_ready() && !flare_.is_null())
       flare_.Run(syncer::APPS);
   } else if (extensions::util::ShouldSyncExtension(&extension, profile_)) {
     if (extension_sync_bundle_.IsSyncing())
       extension_sync_bundle_.SyncChangeIfNeeded(extension);
     else if (extension_service_->is_ready() && !flare_.is_null())
       flare_.Run(syncer::EXTENSIONS);
   }
 }