Remove --install-from-webstore and --limited-install-from-webstore

chrome/browser/extensions/webstore_startup_installer_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 272 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   // Have we seen an installation notification for kTestExtensionId ?
   bool saw_install_;
 
   // How many NOTIFICATION_BROWSER_OPENED notifications have we seen?
   int browser_open_count_;
 };
 
-IN_PROC_BROWSER_TEST_F(CommandLineWebstoreInstall, Accept) {
+IN_PROC_BROWSER_TEST_F(CommandLineWebstoreInstall, CannotInstallNonEphemeral) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendSwitchASCII(
-      switches::kInstallFromWebstore, kTestExtensionId);
+      switches::kInstallEphemeralAppFromWebstore, kTestExtensionId);
   ExtensionInstallPrompt::g_auto_confirm_for_tests =
       ExtensionInstallPrompt::ACCEPT;
   extensions::StartupHelper helper;
-  EXPECT_TRUE(helper.InstallFromWebstore(*command_line, browser()->profile()));
-  EXPECT_TRUE(saw_install());
-  EXPECT_EQ(0, browser_open_count());
-}
-
-IN_PROC_BROWSER_TEST_F(CommandLineWebstoreInstall, Cancel) {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  command_line->AppendSwitchASCII(
-      switches::kInstallFromWebstore, kTestExtensionId);
-  ExtensionInstallPrompt::g_auto_confirm_for_tests =
-      ExtensionInstallPrompt::CANCEL;
-  extensions::StartupHelper helper;
-  EXPECT_FALSE(helper.InstallFromWebstore(*command_line, browser()->profile()));
+  EXPECT_FALSE(helper.InstallEphemeralApp(*command_line, browser()->profile()));
   EXPECT_FALSE(saw_install());
   EXPECT_EQ(0, browser_open_count());
 }
-
-IN_PROC_BROWSER_TEST_F(CommandLineWebstoreInstall, LimitedAccept) {
-  extensions::StartupHelper helper;
-
-  // Small test of "WebStoreIdFromLimitedInstallCmdLine" which made more
-  // sense together with the rest of the test for "LimitedInstallFromWebstore".
-  base::CommandLine command_line_test1(base::CommandLine::NO_PROGRAM);
-  command_line_test1.AppendSwitchASCII(switches::kLimitedInstallFromWebstore,
-      "1");
-  EXPECT_EQ("nckgahadagoaajjgafhacjanaoiihapd",
-      helper.WebStoreIdFromLimitedInstallCmdLine(command_line_test1));
-
-  base::CommandLine command_line_test2(base::CommandLine::NO_PROGRAM);
-  command_line_test1.AppendSwitchASCII(switches::kLimitedInstallFromWebstore,
-      "2");
-  EXPECT_EQ(kTestExtensionId,
-      helper.WebStoreIdFromLimitedInstallCmdLine(command_line_test1));
-
-  // Now, on to the real test for LimitedInstallFromWebstore.
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  command_line->AppendSwitchASCII(
-      switches::kLimitedInstallFromWebstore, "2");
-  helper.LimitedInstallFromWebstore(*command_line, browser()->profile(),
-      base::MessageLoop::QuitWhenIdleClosure());
-  base::MessageLoop::current()->Run();
-
-  EXPECT_TRUE(saw_install());
-  EXPECT_EQ(0, browser_open_count());
-}