Promotion of ephemeral apps now handles permission escalation correctly

chrome/browser/apps/ephemeral_app_browsertest.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/ephemeral_app_browsertest.h"
 
 #include <vector>
 
 #include "apps/saved_files_service.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 536 matching lines @@
   VerifySyncChange(sync_change.get(), true);
 }
 
 // Verifies that promoting an ephemeral app will enable it.
 IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest, PromoteEphemeralAppAndEnable) {
   InitSyncService();
 
   const Extension* app = InstallEphemeralApp(kNotificationsTestApp);
   ASSERT_TRUE(app);
 
-  // Disable the ephemeral app.
+  // Disable the ephemeral app due to a permissions increase. This also involves
+  // setting the DidExtensionEscalatePermissions flag.
+  ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
+  prefs->SetDidExtensionEscalatePermissions(app, true);
   ExtensionService* service =
       ExtensionSystem::Get(profile())->extension_service();
   service->DisableExtension(app->id(), Extension::DISABLE_PERMISSIONS_INCREASE);
   ASSERT_TRUE(ExtensionRegistry::Get(profile())->
       GetExtensionById(app->id(), ExtensionRegistry::DISABLED));
 
   // Promote to a regular installed app. It should be enabled.
   PromoteEphemeralApp(app);
   VerifyPromotedApp(app->id(), ExtensionRegistry::ENABLED);
+  EXPECT_FALSE(prefs->DidExtensionEscalatePermissions(app->id()));
 
   scoped_ptr<AppSyncData> sync_change = GetFirstSyncChangeForApp(app->id());
   VerifySyncChange(sync_change.get(), true);
 }
 
 // Verifies that promoting an ephemeral app that has unsupported requirements
 // will not enable it.
 IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
                        PromoteUnsupportedEphemeralApp) {
   InitSyncService();
@@ skipping 93 matching lines @@
   CloseApp(app_id);
   installed_signal.Wait();
   VerifyPromotedApp(app_id, ExtensionRegistry::ENABLED);
 
   // Check the notification parameters.
   const InstallObserver::InstallParameters& params = installed_observer.Last();
   EXPECT_EQ(app_id, params.id);
   EXPECT_TRUE(params.is_update);
   EXPECT_TRUE(params.from_ephemeral);
 }