CommandLine refactoring and cleanup.

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 86 matching lines @@
 
 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();
+  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.
   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;
@@ skipping 91 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();
+  static 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_;
+  *CommandLine::current_process_commandline_ = *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;
@@ skipping 95 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();
 }