Reorganize CommandLine code.

chrome/test/in_process_browser_test.cc

Index: chrome/test/in_process_browser_test.cc
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 45cb676e6b67ffae68714d2b3795c41f514f01c3..235c5b34420e05224cadbaa5b6ce767d786026e3 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -104,7 +104,7 @@ void InProcessBrowserTest::SetUp() {
   // 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();
+  CommandLine* command_line = CommandLine::ForCurrentProcess();

[Paweł Hajdan Jr., 2011/02/28 11:11:41]

nit: If you take a look at the TODO above, I think this logic can be safely
removed. You're doing a cleanup already, so I'd appreciate including that in the
CL.

It's no longer needed because we run all InProcessBrowserTests in separate
processes, so we don't have to save the original command line for the "next
test", because no "next" test will run in the same address space.

[msw, 2011/02/28 19:42:03]

Done. Is trybot coverage (including IN_PROC_BROWSER_TEST_F tests) sufficient, or
should we test this change in another way? Also, does this mean that
original_single_process_ is unnecessary?

[Paweł Hajdan Jr., 2011/02/28 21:01:16]

Trybots are sufficient IMO. Yeah, original_single_process_ should also be
unnecessary now, good catch. Please remove it.

[msw, 2011/02/28 23:44:47]

Done.

   original_command_line_.reset(new CommandLine(*command_line));
 
   // Create a temporary user data directory if required.
@@ -216,7 +216,7 @@ void InProcessBrowserTest::PrepareTestCommandLine(
 }
 
 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()) {
@@ -243,7 +243,7 @@ void InProcessBrowserTest::TearDown() {
   BrowserView::SetShowState(-1);
 #endif
 
-  *CommandLine::ForCurrentProcessMutable() = *original_command_line_;
+  *CommandLine::ForCurrentProcess() = *original_command_line_;
   RenderProcessHost::set_run_renderer_in_process(original_single_process_);
 }