1 files changed, 7 insertions, 11 deletions
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index d755b6f..ccf356c 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -363,19 +363,15 @@ int main(int argc, const char* argv[]) {
     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();
+  const std::vector<CommandLine::StringType>& args = parsed_command_line.args();
   if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
-    if (values.size() == 3) {
-      return DiffImages(FilePath::FromWStringHack(values[0]),
-                        FilePath::FromWStringHack(values[1]),
-                        FilePath::FromWStringHack(values[2]));
+    if (args.size() == 3) {
+      return DiffImages(FilePath(args[0]),
+                        FilePath(args[1]),
+                        FilePath(args[2]));
     }
-  } else if (values.size() == 2) {
-    return CompareImages(FilePath::FromWStringHack(values[0]),
-                         FilePath::FromWStringHack(values[1]));
+  } else if (args.size() == 2) {
+    return CompareImages(FilePath(args[0]), FilePath(args[1]));
   }
 
   PrintHelp();