CommandLine API rework

chrome/browser/printing/printing_layout_uitest.cc

Index: chrome/browser/printing/printing_layout_uitest.cc
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 086c2b944b3139aebf4048fcedb9c52bb7139df5..038ee5d6d3001550dfec5d11a894ac05b701bb92 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -204,10 +204,7 @@ class PrintingLayoutTest : public PrintingTest<UITest> {
   PrintingLayoutTest() {
     emf_path_ = browser_directory_;
     file_util::AppendToPath(&emf_path_, L"emf_dumps");
-    std::wstring arg(L" --debug-print=\"");
-    arg += emf_path_;
-    arg += L"\"";
-    launch_arguments_.append(arg);
+    launch_arguments_.AppendSwitchWithValue(L"debug-print", L'"' + emf_path_ + L'"');
     show_window_ = true;
   }
 
@@ -371,7 +368,7 @@ class PrintingLayoutTest : public PrintingTest<UITest> {
   }
 
   static bool GenerateFiles() {
-    return CommandLine().HasSwitch(kGenerateSwitch);
+    return CommandLine::ForCurrentProcess()->HasSwitch(kGenerateSwitch);
   }
 
   const std::wstring& emf_path() const { return emf_path_; }