Use ASCII strings for switch names.

courgette/courgette_tool.cc

 // Copyright (c) 2009 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 <vector>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 331 matching lines @@
 bool WideStringToInt(const std::wstring& str, int *output) {
   string16 copy(str.begin(), str.end());
   return StringToInt(copy, output);
 }
 
 int main(int argc, const char* argv[]) {
   base::AtExitManager at_exit_manager;
   CommandLine::Init(argc, argv);
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
-  bool cmd_dis = command_line.HasSwitch(L"dis");
-  bool cmd_asm = command_line.HasSwitch(L"asm");
-  bool cmd_disadj = command_line.HasSwitch(L"disadj");
-  bool cmd_make_patch = command_line.HasSwitch(L"gen");
-  bool cmd_apply_patch = command_line.HasSwitch(L"apply");
-  bool cmd_make_bsdiff_patch = command_line.HasSwitch(L"genbsdiff");
-  bool cmd_apply_bsdiff_patch = command_line.HasSwitch(L"applybsdiff");
-  bool cmd_spread_1_adjusted = command_line.HasSwitch(L"gen1a");
-  bool cmd_spread_1_unadjusted = command_line.HasSwitch(L"gen1u");
+  bool cmd_dis = command_line.HasSwitch("dis");
+  bool cmd_asm = command_line.HasSwitch("asm");
+  bool cmd_disadj = command_line.HasSwitch("disadj");
+  bool cmd_make_patch = command_line.HasSwitch("gen");
+  bool cmd_apply_patch = command_line.HasSwitch("apply");
+  bool cmd_make_bsdiff_patch = command_line.HasSwitch("genbsdiff");
+  bool cmd_apply_bsdiff_patch = command_line.HasSwitch("applybsdiff");
+  bool cmd_spread_1_adjusted = command_line.HasSwitch("gen1a");
+  bool cmd_spread_1_unadjusted = command_line.HasSwitch("gen1u");
 
   std::vector<std::wstring> values = command_line.GetLooseValues();
 
   // '-repeat=N' is for debugging.  Running many iterations can reveal leaks and
   // bugs in cleanup.
   int repeat_count = 1;
-  std::wstring repeat_switch = command_line.GetSwitchValue(L"repeat");
+  std::wstring repeat_switch = command_line.GetSwitchValue("repeat");
   if (!repeat_switch.empty())
     if (!WideStringToInt(repeat_switch, &repeat_count))
       repeat_count = 1;
 
   if (cmd_dis + cmd_asm + cmd_disadj + cmd_make_patch + cmd_apply_patch +
       cmd_make_bsdiff_patch + cmd_apply_bsdiff_patch +
       cmd_spread_1_adjusted + cmd_spread_1_unadjusted
       != 1)
     UsageProblem(
         "Must have exactly one of:\n"
@@ skipping 31 matching lines @@
     } else if (cmd_spread_1_adjusted || cmd_spread_1_unadjusted) {
       if (values.size() != 3)
         UsageProblem("-gen1[au] <old_file> <new_file> <patch_files_root>");
       DisassembleAdjustDiff(values[0], values[1], values[2],
                             cmd_spread_1_adjusted);
     } else {
       UsageProblem("No operation specified");
     }
   }
 }