Convert some tools to use FilePaths for file names.

chrome/tools/convert_dict/convert_dict_unittest.cc

 // Copyright (c) 2010 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 <map>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 72 matching lines @@
   file_util::CreateTemporaryFile(&aff_file);
   file_util::WriteFile(aff_file, aff_data.c_str(), aff_data.length());
 
   FilePath dic_file;
   file_util::CreateTemporaryFile(&dic_file);
   file_util::WriteFile(dic_file, dic_data.c_str(), dic_data.length());
 
   {
     // 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.
     EXPECT_EQ(word_list.size(), dic_reader.words().size());
     for (size_t i = 0; i < dic_reader.words().size(); ++i) {
       SCOPED_TRACE(StringPrintf("dic_reader.words()[%" PRIuS "]: %s",
                                 i, dic_reader.words()[i].first.c_str()));
       std::wstring word(UTF8ToWide(dic_reader.words()[i].first));
       EXPECT_TRUE(word_list.find(word) != word_list.end());
     }
@@ skipping 75 matching lines @@
     L"\x00f6\x006e\x00f6\x006b",
     L"\x006d\x0061\x0067\x0075\x006b",
   };
 
   std::map<std::wstring, bool> word_list;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kWords); ++i)
     word_list.insert(std::make_pair<std::wstring, bool>(kWords[i], true));
 
   RunDictionaryTest(kCodepage, word_list);
 }