Convert some helper tools to use FilePaths for file names.

Add a "PRFilePath" macro to file_path.h for use in printf'ing
a FilePath.

These are some of the last users of deprecated file_util functions
(e.g. OpenFile(wstring, ...)).

BUG=24672

Review URL: http://codereview.chromium.org/2929002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52391 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 25 insertions, 25 deletions

diff --git a/chrome/tools/convert_dict/aff_reader.cc b/chrome/tools/convert_dict/aff_reader.cc
index 767ba92..0e6cfda 100644
--- a/chrome/tools/convert_dict/aff_reader.cc
+++ b/chrome/tools/convert_dict/aff_reader.cc
@@ -46,9 +46,8 @@ void CollapseDuplicateSpaces(std::string* str) {
 
 }  // namespace
 
-AffReader::AffReader(const std::string& filename)
+AffReader::AffReader(const FilePath& path)
     : has_indexed_affixes_(false) {
-  FilePath path = FilePath::FromWStringHack(ASCIIToWide(filename));
   file_ = file_util::OpenFile(path, "r");
 
   // Default to Latin1 in case the file doesn't specify it.
diff --git a/chrome/tools/convert_dict/aff_reader.h b/chrome/tools/convert_dict/aff_reader.h
index d870d88..e353d67 100644
--- a/chrome/tools/convert_dict/aff_reader.h
+++ b/chrome/tools/convert_dict/aff_reader.h
@@ -10,11 +10,13 @@
 #include <string>
 #include <vector>
 
+class FilePath;
+
 namespace convert_dict {
 
 class AffReader {
  public:
-  explicit AffReader(const std::string& filename);
+  explicit AffReader(const FilePath& path);
   ~AffReader();
 
   bool Read();
diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index f400155..6b4ab17 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc
@@ -14,6 +14,7 @@
 #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"
@@ -82,7 +83,11 @@ int PrintHelp() {
 
 }  // 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();
@@ -90,19 +95,19 @@ int main(int argc, char* argv[]) {
   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;
@@ -125,9 +130,9 @@ int main(int argc, char* argv[]) {
     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;
diff --git a/chrome/tools/convert_dict/convert_dict_unittest.cc b/chrome/tools/convert_dict/convert_dict_unittest.cc
index 525da05..25568a1 100644
--- a/chrome/tools/convert_dict/convert_dict_unittest.cc
+++ b/chrome/tools/convert_dict/convert_dict_unittest.cc
@@ -90,17 +90,10 @@ void RunDictionaryTest(const char* codepage,
   {
     // Read the above affix file with AffReader and read the dictionary file
     // with DicReader, respectively.
-#if defined(OS_WIN)
-    std::string aff_path = WideToUTF8(aff_file.value());
-    std::string dic_path = WideToUTF8(dic_file.value());
-#else
-    std::string aff_path = aff_file.value();
-    std::string dic_path = dic_file.value();
-#endif
-    convert_dict::AffReader aff_reader(aff_path);
+    convert_dict::AffReader aff_reader(aff_file);
     EXPECT_TRUE(aff_reader.Read());
 
-    convert_dict::DicReader dic_reader(dic_path);
+    convert_dict::DicReader dic_reader(dic_file);
     EXPECT_TRUE(dic_reader.Read(&aff_reader));
 
     // Verify this DicReader includes all the input words.
diff --git a/chrome/tools/convert_dict/dic_reader.cc b/chrome/tools/convert_dict/dic_reader.cc
index 38400a9..c8ee113 100644
--- a/chrome/tools/convert_dict/dic_reader.cc
+++ b/chrome/tools/convert_dict/dic_reader.cc
@@ -128,8 +128,7 @@ bool PopulateWordSet(WordSet* word_set, FILE* file, AffReader* aff_reader,
 
 }  // namespace
 
-DicReader::DicReader(const std::string& filename) {
-  FilePath path = FilePath::FromWStringHack(ASCIIToWide(filename));
+DicReader::DicReader(const FilePath& path) {
   file_ = file_util::OpenFile(path, "r");
 
   FilePath additional_path =
diff --git a/chrome/tools/convert_dict/dic_reader.h b/chrome/tools/convert_dict/dic_reader.h
index efb06a7..4e63ae4f 100644
--- a/chrome/tools/convert_dict/dic_reader.h
+++ b/chrome/tools/convert_dict/dic_reader.h
@@ -10,6 +10,8 @@
 #include <string>
 #include <vector>
 
+class FilePath;
+
 namespace convert_dict {
 
 class AffReader;
@@ -23,7 +25,7 @@ class DicReader {
   typedef std::pair<std::string, std::vector<int> > WordEntry;
   typedef std::vector<WordEntry> WordList;
 
-  explicit DicReader(const std::string& filename);
+  explicit DicReader(const FilePath& path);
   ~DicReader();
 
   // Non-numeric affixes will be added to the given AffReader and converted into