Promotion of ephemeral apps now handles permission escalation correctly

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 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_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 2008 matching lines @@
 
   if (!is_from_sync) {
     if (extension->RequiresSortOrdinal()) {
       // Reset the sort ordinals of the app to ensure it is added to the default
       // position, like newly installed apps would.
       extension_prefs_->app_sorting()->ClearOrdinals(extension->id());
       extension_prefs_->app_sorting()->EnsureValidOrdinals(
           extension->id(), syncer::StringOrdinal());
     }
 
-    if (extension_prefs_->IsExtensionDisabled(extension->id()) &&
-        !extension_prefs_->IsExtensionBlacklisted(extension->id())) {
-      // If the extension is not blacklisted and was disabled due to permission
-      // increase or user action only, we can enable it because the user was
-      // prompted.
-      extension_prefs_->RemoveDisableReason(
-          extension->id(),
-          Extension::DISABLE_PERMISSIONS_INCREASE);
-      extension_prefs_->RemoveDisableReason(
-          extension->id(),
-          Extension::DISABLE_USER_ACTION);
-      if (!extension_prefs_->GetDisableReasons(extension->id()))
-        EnableExtension(extension->id());
-    }
+    // Cached ephemeral apps may be updated and disabled due to permissions
+    // increase. The app can be enabled as the install was user-acknowledged.
+    if (extension_prefs_->DidExtensionEscalatePermissions(extension->id()))
+      GrantPermissionsAndEnableExtension(extension);
   }
 
   // Remove the ephemeral flags from the preferences.
   extension_prefs_->OnEphemeralAppPromoted(extension->id());
 
   // Fire install-related events to allow observers to handle the promotion
   // of the ephemeral app.
   extensions::InstalledExtensionInfo details(
       extension,
       true /* is update */,
@@ skipping 492 matching lines @@
 }
 
 void ExtensionService::OnProfileDestructionStarted() {
   ExtensionIdSet ids_to_unload = registry_->enabled_extensions().GetIDs();
   for (ExtensionIdSet::iterator it = ids_to_unload.begin();
        it != ids_to_unload.end();
        ++it) {
     UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN);
   }
 }