crashpad_database_util: Don’t create a database unless explicitly asked

handler/main.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include <getopt.h>
 #include <stdlib.h>
 
 #include <map>
 #include <string>
 
 #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"
 #include "tools/tool_support.h"
 #include "handler/crash_report_upload_thread.h"
 #include "util/stdlib/map_insert.h"
 #include "util/stdlib/string_number_conversion.h"
 #include "util/string/split_string.h"
 #include "util/synchronization/semaphore.h"
 
@@ skipping 183 matching lines @@
 
   ExceptionHandlerServer exception_handler_server;
 
 #if defined(OS_MACOSX)
   CloseStdinAndStdout();
   ChildPortHandshake::RunClient(options.handshake_fd,
                                 exception_handler_server.receive_port(),
                                 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;
   }
 
   CrashReportUploadThread upload_thread(database.get(), options.url);
   upload_thread.Start();
 
   CrashReportExceptionHandler exception_handler(
       database.get(), &upload_thread, &options.annotations);
 
@@ skipping 13 matching lines @@
 
 #if defined(OS_MACOSX)
 int main(int argc, char* argv[]) {
   return crashpad::HandlerMain(argc, argv);
 }
 #elif defined(OS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::HandlerMain);
 }
 #endif  // OS_MACOSX