Linux Breakpad: Call base::GetLinuxDistro() on the right thread.

components/breakpad/browser/crash_handler_host_linux.cc

 // Copyright 2013 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/breakpad/browser/crash_handler_host_linux.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/syscall.h>
@@ skipping 282 matching lines @@
   scoped_ptr<BreakpadInfo> info(new BreakpadInfo);
 
   info->fd = -1;
   info->process_type_length = process_type_.length();
   // Freed in CrashDumpTask().
   char* process_type_str = new char[info->process_type_length + 1];
   process_type_.copy(process_type_str, info->process_type_length);
   process_type_str[info->process_type_length] = '\0';
   info->process_type = process_type_str;
 
-  std::string distro = base::GetLinuxDistro();
-  info->distro_length = distro.length();
-  // Freed in CrashDumpTask().
-  char* distro_str = new char[info->distro_length + 1];
-  distro.copy(distro_str, info->distro_length);
-  distro_str[info->distro_length] = '\0';
-  info->distro = distro_str;
-
   // Memory released from scoped_ptrs below are also freed in CrashDumpTask().
   info->crash_keys = crash_keys.release();
 #if defined(ADDRESS_SANITIZER)
   asan_report[kMaxAsanReportSize] = '\0';
   info->asan_report_str = asan_report.release();
   info->asan_report_length = strlen(info->asan_report_str);
 #endif
 
   info->process_start_time = uptime;
   info->oom_size = oom_size;
@@ skipping 16 matching lines @@
                  signal_fd));
 }
 
 void CrashHandlerHostLinux::WriteDumpFile(scoped_ptr<BreakpadInfo> info,
                                           scoped_ptr<char[]> crash_context,
                                           pid_t crashing_pid,
                                           int signal_fd) {
   DCHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread(
       worker_pool_token_));
 
+  // Set |info->distro| here because base::GetLinuxDistro() needs to run on a
+  // blocking thread.
+  std::string distro = base::GetLinuxDistro();
+  info->distro_length = distro.length();
+  // Freed in CrashDumpTask().
+  char* distro_str = new char[info->distro_length + 1];
+  distro.copy(distro_str, info->distro_length);
+  distro_str[info->distro_length] = '\0';
+  info->distro = distro_str;
+
   base::FilePath dumps_path("/tmp");
   PathService::Get(base::DIR_TEMP, &dumps_path);
   if (!info->upload)
     dumps_path = dumps_path_;
   const std::string minidump_filename =
       base::StringPrintf("%s/chromium-%s-minidump-%016" PRIx64 ".dmp",
                          dumps_path.value().c_str(),
                          process_type_.c_str(),
                          base::RandUint64());
 
@@ skipping 63 matching lines @@
   // no-ops.
   shutting_down_ = true;
   uploader_thread_->Stop();
 }
 
 bool CrashHandlerHostLinux::IsShuttingDown() const {
   return shutting_down_;
 }
 
 }  // namespace breakpad