Merge 48149 - Relanding 48042....

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2010 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/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 120 matching lines @@
   command_line->AppendSwitchWithValue(switches::kUserDataDir,
                                       user_data_dir.ToWStringHack());
 
   // For some reason the sandbox wasn't happy running in test mode. These
   // tests aren't intended to test the sandbox, so we turn it off.
   command_line->AppendSwitch(switches::kNoSandbox);
 
   // Don't show the first run ui.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
-  // TODO(jcivelli): http://crbug.com/44089 We disable the app launcher on new
-  //                 tab behavior for now until it is the default behavior on
-  //                 all platforms.
-  command_line->AppendSwitch(switches::kDisableAppsPanel);
-
   // This is a Browser test.
   command_line->AppendSwitchWithValue(switches::kTestType,
                                       ASCIIToWide(kBrowserTestType));
 
   // Single-process mode is not set in BrowserMain so it needs to be processed
   // explicitly.
   original_single_process_ = RenderProcessHost::run_renderer_in_process();
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
@@ skipping 174 matching lines @@
 
   GTEST_NONFATAL_FAILURE_(error_message.c_str());
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
   DCHECK_GT(timeout_value, 0);
   initial_timeout_ = timeout_value;
 }