Merge 195393 "Two fixes for the limited install from webstore flag."

chrome/browser/extensions/webstore_startup_installer_browsertest.cc

Index: chrome/browser/extensions/webstore_startup_installer_browsertest.cc
===================================================================
--- chrome/browser/extensions/webstore_startup_installer_browsertest.cc	(revision 195576)
+++ chrome/browser/extensions/webstore_startup_installer_browsertest.cc	(working copy)
@@ -353,8 +353,6 @@
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitchASCII(
       switches::kLimitedInstallFromWebstore, "2");
-  command_line->AppendSwitchASCII(
-      switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
   helper.LimitedInstallFromWebstore(*command_line, browser()->profile(),
       MessageLoop::QuitWhenIdleClosure());
   MessageLoop::current()->Run();
@@ -362,17 +360,3 @@
   EXPECT_TRUE(saw_install());
   EXPECT_EQ(0, browser_open_count());
 }
-
-IN_PROC_BROWSER_TEST_F(CommandLineWebstoreInstall, LimitedCancel) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitchASCII(
-      switches::kLimitedInstallFromWebstore, "2");
-  command_line->AppendSwitchASCII(
-      switches::kAppsGalleryInstallAutoConfirmForTests, "cancel");
-  extensions::StartupHelper helper;
-  helper.LimitedInstallFromWebstore(*command_line, browser()->profile(),
-      MessageLoop::QuitWhenIdleClosure());
-  MessageLoop::current()->Run();
-  EXPECT_FALSE(saw_install());
-  EXPECT_EQ(0, browser_open_count());
-}