CommandLine refactoring and cleanup.

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..7843ed0f6881978b7cae8373e0faaad560fc47b2 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::current_process_commandline_;

[Paweł Hajdan Jr., 2011/02/25 18:01:53]

nit: Accessing a private variable like that is ugly. Can you find a cleaner
solution?

[msw, 2011/05/10 23:18:43]

Done (r76339).

   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();
+  static 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::current_process_commandline_ = *original_command_line_;
   RenderProcessHost::set_run_renderer_in_process(original_single_process_);
 }