Remove ability to launch ephemeral apps from the app launcher.

chrome/browser/apps/ephemeral_app_launcher_browsertest.cc

 // Copyright 2014 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/message_loop/message_loop_proxy.h"
 #include "chrome/browser/apps/ephemeral_app_launcher.h"
 #include "chrome/browser/apps/ephemeral_app_service.h"
 #include "chrome/browser/extensions/extension_install_checker.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/test_blacklist.h"
 #include "chrome/browser/extensions/webstore_installer_test.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/test/extension_test_message_listener.h"
-#include "ui/app_list/app_list_switches.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSystem;
 using extensions::InstallTracker;
 namespace webstore_install = extensions::webstore_install;
 
 namespace {
 
@@ skipping 160 matching lines @@
                               kNonAppDomain) {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebstoreInstallerTest::SetUpCommandLine(command_line);
 
     // Make event pages get suspended immediately.
     extensions::ProcessManager::SetEventPageIdleTimeForTesting(1);
     extensions::ProcessManager::SetEventPageSuspendingTimeForTesting(1);
 
     // Enable ephemeral apps flag.
-    command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
+    command_line->AppendSwitch(switches::kEnableEphemeralAppsInWebstore);
   }
 
   void SetUpOnMainThread() override {
     WebstoreInstallerTest::SetUpOnMainThread();
 
     // Disable ephemeral apps immediately after they stop running in tests.
     EphemeralAppService::Get(profile())->set_disable_delay_for_test(0);
   }
 
   base::FilePath GetTestPath(const char* test_name) {
@@ skipping 89 matching lines @@
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // Skip EphemeralAppLauncherTest as it enables the feature.
     WebstoreInstallerTest::SetUpCommandLine(command_line);
   }
 };
 
 // Verifies that an ephemeral app will not be installed and launched if the
 // feature is disabled.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTestDisabled, FeatureDisabled) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      app_list::switches::kDisableExperimentalAppList);
   RunLaunchTest(
       kDefaultAppCrxFilename, webstore_install::LAUNCH_FEATURE_DISABLED, false);
   EXPECT_FALSE(GetInstalledExtension(kDefaultAppId));
 }
 
 // Verifies that an app with no permission warnings will be installed
 // ephemerally and launched without prompting the user.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest,
                        LaunchAppWithNoPermissionWarnings) {
   content::WindowedNotificationObserver unloaded_signal(
@@ skipping 234 matching lines @@
 }
 
 // Verifies that a launch will fail if a duplicate launch is in progress.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) {
   extensions::ActiveInstallData install_data(kDefaultAppId);
   install_data.is_ephemeral = true;
   InstallTracker::Get(profile())->AddActiveInstall(install_data);
 
   RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false);
 }