crashpad_database_util: Don’t create a database unless explicitly asked

handler/main.cc

Index: handler/main.cc
diff --git a/handler/main.cc b/handler/main.cc
index 261808c915edbbb8a96dbfb5d49b546be4b8620a..5f192f92752f3099802f0450fffad4a4f1ef0c18 100644
--- a/handler/main.cc
+++ b/handler/main.cc
@@ -21,7 +21,6 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "client/crash_report_database.h"
 #include "client/crashpad_client.h"
@@ -225,14 +224,9 @@ int HandlerMain(int argc, char* argv[]) {
                                 MACH_MSG_TYPE_MAKE_SEND);
 #endif  // OS_MACOSX
 
-  scoped_ptr<CrashReportDatabase> database(
-      CrashReportDatabase::Initialize(base::FilePath(
-#if defined(OS_MACOSX)
-          options.database
-#elif defined(OS_WIN)
-          base::UTF8ToUTF16(options.database)
-#endif
-          )));
+  scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
+      base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
+          options.database))));
   if (!database) {
     return EXIT_FAILURE;
   }