Reorganize CommandLine code.

chrome/test/in_process_browser_test.h

 // 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.
 
 #ifndef CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/ref_counted.h"
@@ skipping 182 matching lines @@
   // tests for example need the windows shown).
   bool show_window_;
 
   // Whether the JavaScript can access the DOMAutomationController (a JS object
   // that can send messages back to the browser).
   bool dom_automation_enabled_;
 
   // Whether this test requires the TabCloseableStateWatcher.
   bool tab_closeable_state_watcher_enabled_;
 
-  // We muck with the global command line for this process.  Keep the original
-  // so we can reset it when we're done.  This matters when running the browser
-  // tests in "single process" (all tests in one process) mode.
-  scoped_ptr<CommandLine> original_command_line_;
-
-  // Saved to restore the value of RenderProcessHost::run_renderer_in_process.
-  bool original_single_process_;
-
   // Host resolver to use during the test.
   scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_;
 
   // Temporary user data directory. Used only when a user data directory is not
   // specified in the command line.
   ScopedTempDir temp_user_data_dir_;
 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
 #endif  // defined(OS_CHROMEOS)
@@ skipping 31 matching lines @@
             GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
 
 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
   IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
                     ::testing::internal::GetTypeId<test_fixture>())
 
 #endif  // defined(ALLOW_IN_PROC_BROWSER_TEST)
 
 #endif  // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_