Turning the new launcher back on by default

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
-#include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_util.h"
 #include "ash/shell.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/window_util.h"
-#include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
@@ skipping 24 matching lines @@
 class LauncherPlatformPerAppAppBrowserTest
     : public extensions::PlatformAppBrowserTest {
  protected:
   LauncherPlatformPerAppAppBrowserTest()
       : launcher_(NULL),
         controller_(NULL) {
   }
 
   virtual ~LauncherPlatformPerAppAppBrowserTest() {}
 
-  // TODO(skuhne): Remove when the old launcher gets removed.
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    PlatformAppBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(ash::switches::kAshEnablePerAppLauncher);
-  }
-
   ash::LauncherModel* launcher_model() {
     return ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
   }
 
   virtual void RunTestOnMainThreadLoop() OVERRIDE {
     launcher_ = ash::Launcher::ForPrimaryDisplay();
     controller_ = static_cast<ChromeLauncherController*>(launcher_->delegate());
     return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
   }
 
@@ skipping 14 matching lines @@
 // old launcher gets ripped out.
 class LauncherPerAppAppBrowserTest : public ExtensionBrowserTest {
  protected:
   LauncherPerAppAppBrowserTest()
       : launcher_(NULL),
         model_(NULL) {
   }
 
   virtual ~LauncherPerAppAppBrowserTest() {}
 
-  // TODO(skuhne): Remove when the old launcher gets removed.
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    ExtensionBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(ash::switches::kAshEnablePerAppLauncher);
-  }
-
   virtual void RunTestOnMainThreadLoop() OVERRIDE {
     launcher_ = ash::Launcher::ForPrimaryDisplay();
     model_ =
         ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
     return ExtensionBrowserTest::RunTestOnMainThreadLoop();
   }
 
   size_t NumberOfDetectedLauncherBrowsers() {
     ChromeLauncherControllerPerApp* controller =
         static_cast<ChromeLauncherControllerPerApp*>(launcher_->delegate());
@@ skipping 767 matching lines @@
   EXPECT_EQ(++running_browser, BrowserList::size());
 
   LoadAndLaunchExtension("app1", extension_misc::LAUNCH_TAB, NEW_WINDOW);
 
   // A new browser should get detected and one more should be running.
   EXPECT_GE(NumberOfDetectedLauncherBrowsers(), 1u);
   EXPECT_EQ(++running_browser, BrowserList::size());
 }