Get generate_dump compiling on Windows

tools/crashpad_database_util.cc

Index: tools/crashpad_database_util.cc
diff --git a/tools/crashpad_database_util.cc b/tools/crashpad_database_util.cc
index 12b37d65853831b1e4fe5129c6573847968c4185..fa3fd1ff61ae5867ef5fcb940c675ebf56700d36 100644
--- a/tools/crashpad_database_util.cc
+++ b/tools/crashpad_database_util.cc
@@ -42,16 +42,6 @@
 #include <libgen.h>
 #endif  // OS_MACOSX
 
-#if defined(OS_POSIX)
-base::FilePath::StringType UTF8ToFilePathStringType(const char* path) {
-  return path;
-}
-#elif defined(OS_WIN)
-base::FilePath::StringType UTF8ToFilePathStringType(const char* path) {
-  return base::UTF8ToUTF16(path);
-}
-#endif
-
 namespace crashpad {
 namespace {
 
@@ -265,8 +255,9 @@ void ShowReports(const std::vector<CrashReportDatabase::Report>& reports,
 }
 
 int DatabaseUtilMain(int argc, char* argv[]) {
-  const base::FilePath me(
-      base::FilePath(UTF8ToFilePathStringType(argv[0])).BaseName());
+  const base::FilePath argv0(
+      ToolSupport::CommandLineArgumentToFilePathStringType(argv[0]));
+  const base::FilePath me(argv0.BaseName());
 
   enum OptionFlags {
     // “Short” (single-character) options.
@@ -377,8 +368,8 @@ int DatabaseUtilMain(int argc, char* argv[]) {
         break;
       }
       case kOptionNewReport: {
-        options.new_report_paths.push_back(
-            base::FilePath(UTF8ToFilePathStringType(optarg)));
+        options.new_report_paths.push_back(base::FilePath(
+            ToolSupport::CommandLineArgumentToFilePathStringType(optarg)));
         break;
       }
       case kOptionUTC: {
@@ -438,7 +429,8 @@ int DatabaseUtilMain(int argc, char* argv[]) {
   }
 
   scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
-      base::FilePath(UTF8ToFilePathStringType(options.database))));
+      base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
+          options.database))));
   if (!database) {
     return EXIT_FAILURE;
   }
@@ -598,13 +590,6 @@ int main(int argc, char* argv[]) {
 }
 #elif defined(OS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
-  scoped_ptr<char*[]> argv_as_utf8(new char*[argc]);
-  std::vector<std::string> storage;
-  storage.reserve(argc);
-  for (int i = 0; i < argc; ++i) {
-    storage.push_back(base::UTF16ToUTF8(argv[i]));
-    argv_as_utf8[i] = &storage[i][0];
-  }
-  return crashpad::DatabaseUtilMain(argc, argv_as_utf8.get());
+  return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain);
 }
 #endif  // OS_POSIX