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

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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 335 matching lines @@
   CommandLine command_line_test2(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.
   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();
 
   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());
-}