Group commandline settings in UI test and in process browser test.

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/mac/scoped_nsautorelease_pool.h"
@@ skipping 121 matching lines @@
       << "Could not set up user data directory.";
 
   // Don't delete the resources when BrowserMain returns. Many ui classes
   // cache SkBitmaps in a static field so that if we delete the resource
   // bundle we'll crash.
   browser_shutdown::delete_resources_on_shutdown = false;
 
   // Allow subclasses the opportunity to make changes to the command line before
   // running any tests.
   SetUpCommandLine(command_line);
+  // Add command line arguments that are used by all InProcessBrowserTests.
+  PrepareTestCommandLine(command_line);
+
+  // Save the single process mode state before it was reset in this test. This
+  // state will be recovered in TearDown(). 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);
+
+#if defined(OS_CHROMEOS)
+  chromeos::CrosLibrary::Get()->GetTestApi()->SetUseStubImpl();
+
+  // Make sure that the log directory exists.
+  FilePath log_dir = logging::GetSessionLogFile(*command_line).DirName();
+  file_util::CreateDirectory(log_dir);
+#endif  // defined(OS_CHROMEOS)
+
+  SandboxInitWrapper sandbox_wrapper;
+  MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
+  params.ui_task =
+      NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
+
+  host_resolver_ = new net::RuleBasedHostResolverProc(
+      new IntranetRedirectHostResolverProc(NULL));
+
+  // Something inside the browser does this lookup implicitly. Make it fail
+  // to avoid external dependency. It won't break the tests.
+  host_resolver_->AddSimulatedFailure("*.google.com");
+
+  // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
+  // We don't want the test code to use it.
+  host_resolver_->AddSimulatedFailure("wpad");
+
+  net::ScopedDefaultHostResolverProc scoped_host_resolver_proc(
+      host_resolver_.get());
+
+  SetUpInProcessBrowserTestFixture();
+
+  BrowserMain(params);
+  TearDownInProcessBrowserTestFixture();
+}
+
+void InProcessBrowserTest::PrepareTestCommandLine(
+    CommandLine* command_line) {
+  // Propagate commandline settings from test_launcher_utils.
+  test_launcher_utils::PrepareBrowserCommandLineForTests(command_line);
 
 #if defined(OS_WIN)
   // Hide windows on show.
   if (!command_line->HasSwitch(kUnitTestShowWindows) && !show_window_)
     BrowserView::SetShowState(SW_HIDE);
 #endif
 
   if (dom_automation_enabled_)
     command_line->AppendSwitch(switches::kDomAutomationController);
 
   // This is a Browser test.
   command_line->AppendSwitchASCII(switches::kTestType, 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);
-
 #if defined(OS_WIN)
   // The Windows sandbox requires that the browser and child processes are the
   // same binary.  So we launch browser_process.exe which loads chrome.dll
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
                                  command_line->GetProgram());
 #else
   // Explicitly set the path of the binary used for child processes, otherwise
   // they'll try to use browser_tests which doesn't contain ChromeMain.
   FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
 #if defined(OS_MACOSX)
   // Recreate the real environment, run the helper within the app bundle.
   subprocess_path = subprocess_path.DirName().DirName();
   DCHECK_EQ(subprocess_path.BaseName().value(), "Contents");
   subprocess_path =
       subprocess_path.Append("Versions").Append(chrome::kChromeVersion);
   subprocess_path =
       subprocess_path.Append(chrome::kHelperProcessExecutablePath);
 #endif
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
                                  subprocess_path);
 #endif
 
   // If ncecessary, disable TabCloseableStateWatcher.
   if (!tab_closeable_state_watcher_enabled_)
     command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher);
-
-  test_launcher_utils::PrepareBrowserCommandLineForTests(command_line);
-
-#if defined(OS_CHROMEOS)
-  chromeos::CrosLibrary::Get()->GetTestApi()->SetUseStubImpl();
-
-  // Make sure that the log directory exists.
-  FilePath log_dir = logging::GetSessionLogFile(*command_line).DirName();
-  file_util::CreateDirectory(log_dir);
-#endif  // defined(OS_CHROMEOS)
-
-  SandboxInitWrapper sandbox_wrapper;
-  MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
-  params.ui_task =
-      NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
-
-  host_resolver_ = new net::RuleBasedHostResolverProc(
-      new IntranetRedirectHostResolverProc(NULL));
-
-  // Something inside the browser does this lookup implicitly. Make it fail
-  // to avoid external dependency. It won't break the tests.
-  host_resolver_->AddSimulatedFailure("*.google.com");
-
-  // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
-  // We don't want the test code to use it.
-  host_resolver_->AddSimulatedFailure("wpad");
-
-  net::ScopedDefaultHostResolverProc scoped_host_resolver_proc(
-      host_resolver_.get());
-
-  SetUpInProcessBrowserTestFixture();
-
-  BrowserMain(params);
-  TearDownInProcessBrowserTestFixture();
 }
 
 bool InProcessBrowserTest::CreateUserDataDirectory() {
   CommandLine* command_line = CommandLine::ForCurrentProcessMutable();
   FilePath user_data_dir =
       command_line->GetSwitchValuePath(switches::kUserDataDir);
   if (user_data_dir.empty()) {
     if (temp_user_data_dir_.CreateUniqueTempDir() &&
         temp_user_data_dir_.IsValid()) {
       user_data_dir = temp_user_data_dir_.path();
@@ skipping 111 matching lines @@
     return;
 
   // Invoke CloseAllBrowsersAndExit on a running message loop.
   // CloseAllBrowsersAndExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&BrowserList::CloseAllBrowsersAndExit));
   ui_test_utils::RunMessageLoop();
 }