Convert some tools to use FilePaths for file names.

chrome/tools/convert_dict/convert_dict.cc

 // 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.
 
 // This tool converts Hunspell .aff/.dic pairs to a combined binary dictionary
 // format (.bdic). This format is more compact, and can be more efficiently
 // read by the client application.
 //
 // We do this conversion manually before publishing dictionary files. It is not
 // part of any build process.
 //
 // See PrintHelp() below for usage.
 
 #include <stdio.h>
 
 #include "base/at_exit.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "third_party/hunspell/google/bdict_reader.h"
 #include "third_party/hunspell/google/bdict_writer.h"
 #include "chrome/tools/convert_dict/aff_reader.h"
 #include "chrome/tools/convert_dict/dic_reader.h"
 
@@ skipping 48 matching lines @@
 int PrintHelp() {
   printf("Usage: convert_dict <dicfile base name>\n\n");
   printf("Example:\n");
   printf("  convert_dict en-US\nwill read en-US.dic / en-US.aff and\n");
   printf("generate en-US.bdic\n\n");
   return 1;
 }
 
 }  // namespace
 
+#if defined(OS_WIN)
+int wmain(int argc, wchar_t* argv[]) {
+#else
 int main(int argc, char* argv[]) {
+#endif
   base::EnableTerminationOnHeapCorruption();
   if (argc != 2)
     return PrintHelp();
 
   base::AtExitManager exit_manager;
   icu_util::Initialize();
 
-  std::string file_base = argv[1];
+  FilePath file_base = FilePath(argv[1]);
 
-  std::string aff_name = file_base + ".aff";
-  printf("Reading %s ...\n", aff_name.c_str());
-  convert_dict::AffReader aff_reader(aff_name.c_str());
+  FilePath aff_path = file_base.ReplaceExtension(FILE_PATH_LITERAL(".aff"));
+  printf("Reading %" PRFilePath " ...\n", aff_path.value().c_str());
+  convert_dict::AffReader aff_reader(aff_path);
   if (!aff_reader.Read()) {
     printf("Unable to read the aff file.\n");
     return 1;
   }
 
-  std::string dic_name = file_base + ".dic";
-  printf("Reading %s ...\n", dic_name.c_str());
-  convert_dict::DicReader dic_reader(dic_name.c_str());
+  FilePath dic_path = file_base.ReplaceExtension(FILE_PATH_LITERAL(".dic"));
+  printf("Reading %" PRFilePath " ...\n", dic_path.value().c_str());
+  convert_dict::DicReader dic_reader(dic_path);
   if (!dic_reader.Read(&aff_reader)) {
     printf("Unable to read the dic file.\n");
     return 1;
   }
 
   hunspell::BDictWriter writer;
   writer.SetComment(aff_reader.comments());
   writer.SetAffixRules(aff_reader.affix_rules());
   writer.SetAffixGroups(aff_reader.GetAffixGroups());
   writer.SetReplacements(aff_reader.replacements());
   writer.SetOtherCommands(aff_reader.other_commands());
   writer.SetWords(dic_reader.words());
 
   printf("Serializing...\n");
   std::string serialized = writer.GetBDict();
 
   printf("Verifying...\n");
   if (!VerifyWords(dic_reader.words(), serialized)) {
     printf("ERROR converting, the dictionary does not check out OK.");
     return 1;
   }
 
-  std::string out_name = file_base + ".bdic";
-  printf("Writing %s ...\n", out_name.c_str());
-  FILE* out_file = file_util::OpenFile(out_name, "wb");
+  FilePath out_path = file_base.ReplaceExtension(FILE_PATH_LITERAL(".bdic"));
+  printf("Writing %" PRFilePath " ...\n", out_path.value().c_str());
+  FILE* out_file = file_util::OpenFile(out_path, "wb");
   if (!out_file) {
     printf("ERROR writing file\n");
     return 1;
   }
   size_t written = fwrite(&serialized[0], 1, serialized.size(), out_file);
   CHECK(written == serialized.size());
   file_util::CloseFile(out_file);
 
   return 0;
 }