Promotion of ephemeral apps now handles permission escalation correctly

Promotion of ephemeral apps now handles permission escalation correctly

ExtensionService::PromoteEphemeralApp() now clears the permission
escalation flag as well as enabling the app.

BUG=374018
TEST=browser_tests (EphemeralAppBrowserTest.*)

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=278089

[tmdiep, 2014-06-18 05:17:18]

Realised that there was a bug in the way I handled the re-enabling of the app.

[benwells, 2014-06-18 06:21:27]

lgtm

[tmdiep, 2014-06-18 07:14:59]

The CQ bit was checked by tmdiep@chromium.org

[commit-bot: I haz the power, 2014-06-18 07:16:09]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/tmdiep@chromium.org/345493002/1

[commit-bot: I haz the power, 2014-06-18 08:41:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-18 08:41:46]

Failed to apply patch for chrome/browser/apps/ephemeral_app_browsertest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/apps/ephemeral_app_browsertest.cc
  Hunk #1 succeeded at 578 with fuzz 1 (offset -154 lines).
  Hunk #2 FAILED at 745.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/apps/ephemeral_app_browsertest.cc.rej

Patch:       chrome/browser/apps/ephemeral_app_browsertest.cc
Index: chrome/browser/apps/ephemeral_app_browsertest.cc
diff --git a/chrome/browser/apps/ephemeral_app_browsertest.cc
b/chrome/browser/apps/ephemeral_app_browsertest.cc
index
4744e5031710c6a21650c3755fdbb03fce985b4c..3e5f5ee7b76154fd15e464bc7e605c123a8dfc6c
100644
--- a/chrome/browser/apps/ephemeral_app_browsertest.cc
+++ b/chrome/browser/apps/ephemeral_app_browsertest.cc
@@ -732,7 +732,10 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
PromoteEphemeralAppAndEnable) {
   const Extension* app = InstallEphemeralApp(kRetainDataApp);
   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);
@@ -742,6 +745,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
PromoteEphemeralAppAndEnable) {
   // 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);

[tmdiep, 2014-06-18 11:58:25]

The CQ bit was checked by tmdiep@chromium.org

[commit-bot: I haz the power, 2014-06-18 12:00:05]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/tmdiep@chromium.org/345493002/20001

[commit-bot: I haz the power, 2014-06-18 15:32:19]

Change committed as 278089