Remove FilePath usage from the CrashReporterClient interface on Windows.

components/crash/content/app/crashpad_win.cc

 // Copyright 2015 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.
 
 #include "components/crash/content/app/crashpad.h"
 
 #include <memory>
 
 #include "base/environment.h"
 #include "base/lazy_instance.h"
@@ skipping 20 matching lines @@
 
 }  // namespace
 
 void GetPlatformCrashpadAnnotations(
     std::map<std::string, std::string>* annotations) {
   CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
   base::FilePath exe_file;
   CHECK(PathService::Get(base::FILE_EXE, &exe_file));
   base::string16 product_name, version, special_build, channel_name;
   crash_reporter_client->GetProductNameAndVersion(
-      exe_file, &product_name, &version, &special_build, &channel_name);
+      exe_file.value(), &product_name, &version, &special_build,
+      &channel_name);
   (*annotations)["prod"] = base::UTF16ToUTF8(product_name);
   (*annotations)["ver"] = base::UTF16ToUTF8(version);
   (*annotations)["channel"] = base::UTF16ToUTF8(channel_name);
   if (!special_build.empty())
     (*annotations)["special"] = base::UTF16ToUTF8(special_build);
 #if defined(ARCH_CPU_X86)
   (*annotations)["plat"] = std::string("Win32");
 #elif defined(ARCH_CPU_X86_64)
   (*annotations)["plat"] = std::string("Win64");
 #endif
 }
 
 base::FilePath PlatformCrashpadInitialization(bool initial_client,
                                               bool browser_process,
                                               bool embedded_handler) {
   base::FilePath database_path;  // Only valid in the browser process.
   bool result;
 
   const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
   const char kServerUrlVar[] = "CHROME_CRASHPAD_SERVER_URL";
   std::unique_ptr<base::Environment> env(base::Environment::Create());
 
   if (initial_client) {
     CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
-    crash_reporter_client->GetCrashDumpLocation(&database_path);
+
+    base::string16 database_path_str;
+    crash_reporter_client->GetCrashDumpLocation(&database_path_str);

[grt (UTC plus 2), 2016/06/02 12:55:33]

    if (crash_reporter_client->GetCrashDumpLocation(&database_path_str))
      database_path = base::FilePath(database_path_str);

[ananta, 2016/06/02 20:34:20]

Done.

+    database_path = base::FilePath(database_path_str);
 
     std::map<std::string, std::string> process_annotations;
     GetPlatformCrashpadAnnotations(&process_annotations);
 
 #if defined(GOOGLE_CHROME_BUILD)
     std::string url = "https://clients2.google.com/cr/report";
 #else
     std::string url;
 #endif
 
     // Allow the crash server to be overridden for testing. If the variable
     // isn't present in the environment then the default URL will remain.
     env->GetVar(kServerUrlVar, &url);
 
     base::FilePath exe_file;
     CHECK(PathService::Get(base::FILE_EXE, &exe_file));
 
     bool is_per_user_install =
-        crash_reporter_client->GetIsPerUserInstall(exe_file);
+        crash_reporter_client->GetIsPerUserInstall(exe_file.value());
     if (crash_reporter_client->GetShouldDumpLargerDumps(is_per_user_install)) {
       const uint32_t kIndirectMemoryLimit = 4 * 1024 * 1024;
       crashpad::CrashpadInfo::GetCrashpadInfo()
           ->set_gather_indirectly_referenced_memory(
               crashpad::TriState::kEnabled, kIndirectMemoryLimit);
     }
 
     // If the handler is embedded in the binary (e.g. chrome, setup), we
     // reinvoke it with --type=crashpad-handler. Otherwise, we use the
     // standalone crashpad_handler.exe (for tests, etc.).
@@ skipping 191 matching lines @@
 void __declspec(dllexport) __cdecl UnregisterNonABICompliantCodeRange(
     void* start) {
   ExceptionHandlerRecord* record =
       reinterpret_cast<ExceptionHandlerRecord*>(start);
 
   CHECK(RtlDeleteFunctionTable(&record->runtime_function));
 }
 #endif  // ARCH_CPU_X86_64
 
 }  // extern "C"