Convert some tools to use FilePaths for file names.

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.
 
 #include <algorithm>
 #include <vector>
 #include <string>
 #include <iostream>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/codec/png_codec.h"
 
 #if defined(OS_WIN)
 #include "windows.h"
 #endif
@@ skipping 53 matching lines @@
                                gfx::PNGCodec::FORMAT_RGBA,
                                &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) {
-    FilePath path = FilePath::FromWStringHack(ASCIIToWide(filename));
+  bool CreateFromFilename(const FilePath& path) {
     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 81 matching lines @@
   /* For unfinished webkit-like-mode (see below)
     "\n"
     "  image_diff -s\n"
     "    Reads stream input from stdin, should be EXACTLY of the format\n"
     "    \"Content-length: <byte length> <data>Content-length: ...\n"
     "    it will take as many file pairs as given, and will compare them as\n"
     "    (cmp_file, reference_file) pairs\n");
   */
 }
 
-int CompareImages(const char* file1, const char* file2) {
+int CompareImages(const FilePath& file1, const FilePath& file2) {
   Image actual_image;
   Image baseline_image;
 
   if (!actual_image.CreateFromFilename(file1)) {
-    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file1);
+    fprintf(stderr, "image_diff: Unable to open file \"%" PRFilePath "\"\n",
+            file1.value().c_str());
     return kStatusError;
   }
   if (!baseline_image.CreateFromFilename(file2)) {
-    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file2);
+    fprintf(stderr, "image_diff: Unable to open file \"%" PRFilePath "\"\n",
+            file2.value().c_str());
     return kStatusError;
   }
 
   float percent = PercentageDifferent(actual_image, baseline_image);
   if (percent > 0.0) {
     // failure: The WebKit version also writes the difference image to
     // stdout, which seems excessive for our needs.
     printf("diff: %01.2f%% failed\n", percent);
     return kStatusDifferent;
   }
@@ skipping 69 matching lines @@
         uint32 alpha = base_pixel & RGBA_ALPHA;
         uint32 new_pixel = base_pixel - ((alpha / 2) & RGBA_ALPHA);
         out->set_pixel_at(x, y, new_pixel);
       }
     }
   }
 
   return same;
 }
 
-int DiffImages(const char* file1, const char* file2, const char* out_file) {
+int DiffImages(const FilePath& file1, const FilePath& file2,
+               const FilePath& out_file) {
   Image actual_image;
   Image baseline_image;
 
   if (!actual_image.CreateFromFilename(file1)) {
-    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file1);
+    fprintf(stderr, "image_diff: Unable to open file \"%" PRFilePath "\"\n",
+            file1.value().c_str());
     return kStatusError;
   }
   if (!baseline_image.CreateFromFilename(file2)) {
-    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file2);
+    fprintf(stderr, "image_diff: Unable to open file \"%" PRFilePath "\"\n",
+            file2.value().c_str());
     return kStatusError;
   }
 
   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);
-  FilePath out_path = FilePath::FromWStringHack(ASCIIToWide(out_file));
-  if (file_util::WriteFile(out_path,
+  if (file_util::WriteFile(out_file,
       reinterpret_cast<char*>(&png_encoding.front()), png_encoding.size()) < 0)
     return kStatusError;
 
   return kStatusDifferent;
 }
 
+// It isn't strictly correct to only support ASCII paths, but this
+// program reads paths on stdin and the program that spawns it outputs
+// paths as non-wide strings anyway.
+FilePath FilePathFromASCII(const std::string& str) {
+#if defined(OS_WIN)
+  return FilePath(ASCIIToWide(str));
+#else
+  return FilePath(str);
+#endif
+}
+
 int main(int argc, const char* argv[]) {
   base::EnableTerminationOnHeapCorruption();
   CommandLine::Init(argc, argv);
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.
     std::string stdin_buffer;
-    std::string filename1_buffer;
-    bool have_filename1 = false;
+    FilePath filename1;
     while (std::getline(std::cin, stdin_buffer)) {
       if (stdin_buffer.empty())
         continue;
 
-      if (have_filename1) {
+      if (!filename1.empty()) {
         // CompareImages writes results to stdout unless an error occurred.
-        if (CompareImages(filename1_buffer.c_str(), stdin_buffer.c_str()) ==
-            kStatusError)
+        FilePath filename2 = FilePathFromASCII(stdin_buffer);
+        if (CompareImages(filename1, filename2) == kStatusError)
           printf("error\n");
         fflush(stdout);
-        have_filename1 = false;
+        filename1 = FilePath();
       } else {
         // Save the first filename in another buffer and wait for the second
         // filename to arrive via stdin.
-        filename1_buffer = stdin_buffer;
-        have_filename1 = true;
+        filename1 = FilePathFromASCII(stdin_buffer);
       }
     }
     return 0;
   }
 
+  // TODO: CommandLine::GetLooseValues() should eventually return
+  // CommandLine::StringType (which is the same as
+  // FilePath::StringType and can convert to FilePaths directly).
   std::vector<std::wstring> values = parsed_command_line.GetLooseValues();
   if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
     if (values.size() == 3) {
-      return DiffImages(WideToUTF8(values[0]).c_str(),
-                        WideToUTF8(values[1]).c_str(),
-                        WideToUTF8(values[2]).c_str());
+      return DiffImages(FilePath::FromWStringHack(values[0]),
+                        FilePath::FromWStringHack(values[1]),
+                        FilePath::FromWStringHack(values[2]));
     }
   } else if (values.size() == 2) {
-    return CompareImages(argv[1], argv[2]);
+    return CompareImages(FilePath::FromWStringHack(values[0]),
+                         FilePath::FromWStringHack(values[1]));
   }
 
   PrintHelp();
   return kStatusError;
 }