CommandLine API rework

chrome/test/unit/chrome_test_suite.h

 // Copyright (c) 2006-2008 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_UNIT_CHROME_TEST_SUITE_H_
 #define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
 
 #include "build/build_config.h"
 
 #include "base/stats_table.h"
@@ skipping 23 matching lines @@
     TestSuite::Initialize();
 
     chrome::RegisterPathProvider();
     g_browser_process = new TestingBrowserProcess;
 
     // Notice a user data override, and otherwise default to using a custom
     // user data directory that lives alongside the current app.
     // NOTE: The user data directory will be erased before each UI test that
     //       uses it, in order to ensure consistency.
     std::wstring user_data_dir =
-        CommandLine().GetSwitchValue(switches::kUserDataDir);
+        CommandLine::ForCurrentProcess()->GetSwitchValue(
+            switches::kUserDataDir);
     if (user_data_dir.empty() &&
       PathService::Get(base::DIR_EXE, &user_data_dir))
       file_util::AppendToPath(&user_data_dir, L"test_user_data");
     if (!user_data_dir.empty())
       PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
 
 #if defined(OS_WIN)
     // TODO(port): Remove the #ifdef when ResourceBundle is ported.
     //
     // Force unittests to run using en-us so if we test against string
@@ skipping 20 matching lines @@
     StatsTable::set_current(NULL);
     delete stats_table_;
     
     TestSuite::Shutdown();
   }
 
   StatsTable* stats_table_;
 };
 
 #endif // CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_