Reorganize CommandLine code.

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2011 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 56 matching lines @@
 
 const char kUnitTestShowWindows[] = "show-windows";
 
 // Passed as value of kTestType.
 static const char kBrowserTestType[] = "browser";
 
 InProcessBrowserTest::InProcessBrowserTest()
     : browser_(NULL),
       show_window_(false),
       dom_automation_enabled_(false),
-      tab_closeable_state_watcher_enabled_(false),
-      original_single_process_(false) {
+      tab_closeable_state_watcher_enabled_(false) {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
 #endif
 
   // Before we run the browser, we have to hack the path to the exe to match
   // what it would be if Chrome was running, because it is used to fork renderer
   // processes, on Linux at least (failure to do so will cause a browser_test to
   // be run instead of a renderer).
   FilePath chrome_path;
   CHECK(PathService::Get(base::FILE_EXE, &chrome_path));
   chrome_path = chrome_path.DirName();
   chrome_path = chrome_path.Append(chrome::kBrowserProcessExecutablePath);
   CHECK(PathService::Override(base::FILE_EXE, chrome_path));
 
   test_server_.reset(new net::TestServer(
       net::TestServer::TYPE_HTTP,
       FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
 }
 
 InProcessBrowserTest::~InProcessBrowserTest() {
 }
 
 void InProcessBrowserTest::SetUp() {
-  // Remember the command line.  Normally this doesn't matter, because the test
-  // harness creates a new process for each test, but when the test harness is
-  // running in single process mode, we can't let one test's command-line
-  // changes (e.g. enabling DOM automation) affect other tests.
-  // TODO(phajdan.jr): This save/restore logic is unnecessary.  Remove it.
-  CommandLine* command_line = CommandLine::ForCurrentProcessMutable();
-  original_command_line_.reset(new CommandLine(*command_line));
-
   // Create a temporary user data directory if required.
   ASSERT_TRUE(CreateUserDataDirectory())
       << "Could not create user data directory.";
 
   // The unit test suite creates a testingbrowser, but we want the real thing.
   // Delete the current one. We'll install the testing one in TearDown.
   delete g_browser_process;
   g_browser_process = NULL;
 
   // Allow subclasses the opportunity to make changes to the default user data
   // dir before running any tests.
   ASSERT_TRUE(SetUpUserDataDirectory())
       << "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.
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  // Allow subclasses to change 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();
+  // Single-process mode is not set in BrowserMain, so process it explicitly.
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
 #if defined(OS_CHROMEOS)
   // 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;
@@ skipping 14 matching lines @@
 
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc(
       host_resolver_.get());
 
   SetUpInProcessBrowserTestFixture();
 
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }
 
-void InProcessBrowserTest::PrepareTestCommandLine(
-    CommandLine* command_line) {
+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_)
@@ skipping 24 matching lines @@
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
                                  subprocess_path);
 #endif
 
   // If neccessary, disable TabCloseableStateWatcher.
   if (!tab_closeable_state_watcher_enabled_)
     command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher);
 }
 
 bool InProcessBrowserTest::CreateUserDataDirectory() {
-  CommandLine* command_line = CommandLine::ForCurrentProcessMutable();
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
   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();
     } else {
       LOG(ERROR) << "Could not create temporary user data directory \""
                  << temp_user_data_dir_.path().value() << "\".";
       return false;
     }
   }
   return test_launcher_utils::OverrideUserDataDir(user_data_dir);
 }
 
 void InProcessBrowserTest::TearDown() {
   // Reinstall testing browser process.
   delete g_browser_process;
   g_browser_process = new TestingBrowserProcess();
 
   browser_shutdown::delete_resources_on_shutdown = true;
 
 #if defined(OS_WIN)
   BrowserView::SetShowState(-1);
 #endif
-
-  *CommandLine::ForCurrentProcessMutable() = *original_command_line_;
-  RenderProcessHost::set_run_renderer_in_process(original_single_process_);
 }
 
 void InProcessBrowserTest::AddTabAtIndexToBrowser(
     Browser* browser,
     int index,
     const GURL& url,
     PageTransition::Type transition) {
   browser::NavigateParams params(browser, url, transition);
   params.tabstrip_index = index;
   params.disposition = NEW_FOREGROUND_TAB;
@@ skipping 94 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();
 }