Remove all the ephemeral apps code.

chrome/browser/extensions/extension_install_prompt.cc

Index: chrome/browser/extensions/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 9a90a37a8121499141040c9d8b9b96e33f35a7ee..21550cb8a1c792fff76f4209cc132a05089d89fe 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -206,8 +206,6 @@ std::string ExtensionInstallPrompt::PromptTypeToString(PromptType type) {
       return "EXTERNAL_INSTALL_PROMPT";
     case ExtensionInstallPrompt::POST_INSTALL_PERMISSIONS_PROMPT:
       return "POST_INSTALL_PERMISSIONS_PROMPT";
-    case ExtensionInstallPrompt::LAUNCH_PROMPT:
-      return "LAUNCH_PROMPT";
     case ExtensionInstallPrompt::REMOTE_INSTALL_PROMPT:
       return "REMOTE_INSTALL_PROMPT";
     case ExtensionInstallPrompt::REPAIR_PROMPT:
@@ -218,6 +216,7 @@ std::string ExtensionInstallPrompt::PromptTypeToString(PromptType type) {
       return "DELEGATED_BUNDLE_PERMISSIONS_PROMPT";
     case ExtensionInstallPrompt::UNSET_PROMPT_TYPE:
     case ExtensionInstallPrompt::NUM_PROMPT_TYPES:
+    case ExtensionInstallPrompt::LAUNCH_PROMPT_UNUSED:

[Devlin, 2015/12/07 16:53:59]

Could this one be a NOTREACHED?  (Maybe put it on line 217, and let it fall
through)

[benwells, 2015/12/08 07:20:11]

Done.

       break;
   }
   return "OTHER";
@@ -727,13 +726,8 @@ void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
       profile_ &&
       extensions::ExtensionPrefs::Get(profile_)->HasDisableReason(
           extension->id(), extensions::Extension::DISABLE_REMOTE_INSTALL);
-  bool is_ephemeral =
-      extensions::util::IsEphemeralApp(extension->id(), profile_);
-
   PromptType type = UNSET_PROMPT_TYPE;
-  if (is_ephemeral)
-    type = LAUNCH_PROMPT;
-  else if (is_remote_install)
+  if (is_remote_install)
     type = REMOTE_INSTALL_PROMPT;
   else
     type = RE_ENABLE_PROMPT;
@@ -900,7 +894,6 @@ void ExtensionInstallPrompt::ShowConfirmation() {
     case INLINE_INSTALL_PROMPT:
     case EXTERNAL_INSTALL_PROMPT:
     case INSTALL_PROMPT:
-    case LAUNCH_PROMPT:
     case POST_INSTALL_PERMISSIONS_PROMPT:
     case REMOTE_INSTALL_PROMPT:
     case REPAIR_PROMPT:
@@ -913,6 +906,9 @@ void ExtensionInstallPrompt::ShowConfirmation() {
       prompt_->set_bundle(bundle_);
       break;
     }
+    case LAUNCH_PROMPT_UNUSED:
+      NOTREACHED() << "Erroneous prompt type";
+      return;
     default:
       NOTREACHED() << "Unknown message";
       return;