Deprecate more old filepath functions.

tools/imagediff/image_diff.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.
 
 // This file input format is based loosely on
 // WebKitTools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
 
@@ skipping 71 matching lines @@
                                &data_, &w_, &h_)) {
       Clear();
       return false;
     }
     return true;
   }
 
   // Creates the image from the given filename on disk, and returns true on
   // success.
   bool CreateFromFilename(const char* filename) {
-    FILE* f = file_util::OpenFile(std::string(filename), "rb");
+    FilePath path = FilePath::FromWStringHack(ASCIIToWide(filename));
+    FILE* f = file_util::OpenFile(path, "rb");
     if (!f)
       return false;
 
     std::vector<unsigned char> compressed;
     const int buf_size = 1024;
     unsigned char buf[buf_size];
     size_t num_read = 0;
     while ((num_read = fread(buf, 1, buf_size, f)) > 0) {
       std::copy(buf, &buf[num_read], std::back_inserter(compressed));
     }
@@ skipping 201 matching lines @@
 
   Image diff_image;
   bool same = CreateImageDiff(baseline_image, actual_image, &diff_image);
   if (same)
     return kStatusSame;
 
   std::vector<unsigned char> png_encoding;
   gfx::PNGCodec::Encode(diff_image.data(), gfx::PNGCodec::FORMAT_RGBA,
                         diff_image.w(), diff_image.h(), diff_image.w() * 4,
                         false, &png_encoding);
-  if (file_util::WriteFile(UTF8ToWide(out_file),
+  FilePath out_path = FilePath::FromWStringHack(ASCIIToWide(out_file));
+  if (file_util::WriteFile(out_path,
       reinterpret_cast<char*>(&png_encoding.front()), png_encoding.size()) < 0)
     return kStatusError;
 
   return kStatusDifferent;
 }
 
 int main(int argc, const char* argv[]) {
   base::EnableTerminationOnHeapCorruption();
   CommandLine::Init(argc, argv);
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
@@ skipping 30 matching lines @@
                         WideToUTF8(values[1]).c_str(),
                         WideToUTF8(values[2]).c_str());
     }
   } else if (values.size() == 2) {
     return CompareImages(argv[1], argv[2]);
   }
 
   PrintHelp();
   return kStatusError;
 }