Changing minidump process generation to be in-process on Android.

chrome/app/breakpad_linux.cc

 // Copyright (c) 2012 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.
 
 // For linux_syscall_support.h. This makes it safe to call embedded system
 // calls when in seccomp mode.
 #define SYS_SYSCALL_ENTRYPOINT "playground$syscallEntryPoint"
 
 #include "chrome/app/breakpad_linux.h"
 
@@ skipping 75 matching lines @@
 const char kUploadURL[] = "https://clients2.google.com/cr/staging_report";
 #endif
 
 bool g_is_crash_reporter_enabled = false;
 uint64_t g_process_start_time = 0;
 char* g_crash_log_path = NULL;
 ExceptionHandler* g_breakpad = NULL;
 #if defined(ADDRESS_SANITIZER)
 const char* g_asan_report_str = NULL;
 #endif
+#if defined(OS_ANDROID)
+char* g_process_type = NULL;
+#endif
 
 // Writes the value |v| as 16 hex characters to the memory pointed at by
 // |output|.
 void write_uint64_hex(char* output, uint64_t v) {
   static const char hextable[] = "0123456789abcdef";
 
   for (int i = 15; i >= 0; --i) {
     output[i] = hextable[v & 15];
     v >>= 4;
   }
@@ skipping 13 matching lines @@
 uint64_t kernel_timeval_to_ms(struct kernel_timeval *tv) {
   uint64_t ret = tv->tv_sec;  // Avoid overflow by explicitly using a uint64_t.
   ret *= 1000;
   ret += tv->tv_usec / 1000;
   return ret;
 }
 
 // String buffer size to use to convert a uint64_t to string.
 size_t kUint64StringSize = 21;
 
+static void SetProcessStartTime() {
+  // Set the base process start time value.
+  struct timeval tv;
+  if (!gettimeofday(&tv, NULL))
+    g_process_start_time = timeval_to_ms(&tv);
+  else
+    g_process_start_time = 0;
+}
+
 // uint64_t version of my_int_len() from
 // breakpad/src/common/linux/linux_libc_support.h. Return the length of the
 // given, non-negative integer when expressed in base 10.
 unsigned my_uint64_len(uint64_t i) {
   if (!i)
     return 1;
 
   unsigned len = 0;
   while (i) {
     len++;
@@ skipping 33 matching lines @@
   while (*dest)
       dest++;
   while (len--)
     if (!(*dest++ = *src++))
       return ret;
   *dest = 0;
   return ret;
 }
 #endif
 
+// Populates the passed in allocated strings and their sizes with the GUID,
+// crash url and distro of the crashing process.
+// The passed strings are expected to be at least kGuidSize, kMaxActiveURLSize
+// and kDistroSize bytes long respectively.
+void PopulateGUIDAndURLAndDistro(char* guid, size_t* guid_len_param,
+                                 char* crash_url, size_t* crash_url_len_param,
+                                 char* distro, size_t* distro_len_param) {
+  size_t guid_len = std::min(my_strlen(child_process_logging::g_client_id),
+                             kGuidSize);
+  size_t crash_url_len =
+      std::min(my_strlen(child_process_logging::g_active_url),
+               kMaxActiveURLSize);
+  size_t distro_len = std::min(my_strlen(base::g_linux_distro), kDistroSize);
+  memcpy(guid, child_process_logging::g_client_id, guid_len);
+  memcpy(crash_url, child_process_logging::g_active_url, crash_url_len);
+  memcpy(distro, base::g_linux_distro, distro_len);
+  if (guid_len_param)
+    *guid_len_param = guid_len;
+  if (crash_url_len_param)
+    *crash_url_len_param = crash_url_len;
+  if (distro_len_param)
+    *distro_len_param = distro_len;
+}
+
 // MIME substrings.
 const char g_rn[] = "\r\n";
 const char g_form_data_msg[] = "Content-Disposition: form-data; name=\"";
 const char g_quote_msg[] = "\"";
 const char g_dashdash_msg[] = "--";
 const char g_dump_msg[] = "upload_file_minidump\"; filename=\"dump\"";
 #if defined(ADDRESS_SANITIZER)
 const char g_log_msg[] = "upload_file_log\"; filename=\"log\"";
 #endif
 const char g_content_type_msg[] = "Content-Type: application/octet-stream";
@@ skipping 215 matching lines @@
                                 bool succeeded) {
   return FinalizeCrashDoneAndroid();
 }
 #endif
 
 bool CrashDone(const MinidumpDescriptor& minidump,
                const bool upload,
                const bool succeeded) {
   // WARNING: this code runs in a compromised context. It may not call into
   // libc nor allocate memory normally.
-  if (!succeeded)
+  if (!succeeded) {
+    const char* msg = "Failed to generate minidump.";
+    WriteLog(msg, sizeof(msg) - 1);
     return false;
+  }
 
   DCHECK(!minidump.IsFD());
 
-  BreakpadInfo info;
+  BreakpadInfo info = {0};
   info.filename = minidump.path();
+  info.fd = minidump.fd();
 #if defined(ADDRESS_SANITIZER)
   google_breakpad::PageAllocator allocator;
   const size_t log_path_len = my_strlen(minidump.path());
   char* log_path = reinterpret_cast<char*>(allocator.Alloc(log_path_len + 1));
   my_memcpy(log_path, minidump.path(), log_path_len);
   my_memcpy(log_path + log_path_len - 4, ".log", 4);
   log_path[log_path_len] = '\0';
   info.log_filename = log_path;
 #endif
   info.process_type = "browser";
@@ skipping 25 matching lines @@
 
 #if !defined(OS_ANDROID)
 // Wrapper function, do not add more code here.
 bool CrashDoneUpload(const MinidumpDescriptor& minidump,
                      void* context,
                      bool succeeded) {
   return CrashDone(minidump, true, succeeded);
 }
 #endif
 
+#if defined(OS_ANDROID)
+bool CrashDoneInProcessNoUpload(
+    const google_breakpad::MinidumpDescriptor& descriptor,
+    void* context,
+    const bool succeeded) {
+  // WARNING: this code runs in a compromised context. It may not call into
+  // libc nor allocate memory normally.
+  if (!succeeded) {
+    static const char msg[] = "Crash dump generation failed.\n";
+    WriteLog(msg, sizeof(msg));
+    return false;
+  }
+
+  // Start constructing the message to send to the browser.
+  char guid[kGuidSize + 1] = {0};
+  char crash_url[kMaxActiveURLSize + 1] = {0};
+  char distro[kDistroSize + 1] = {0};
+  size_t guid_length = 0;
+  size_t crash_url_length = 0;
+  size_t distro_length = 0;
+  PopulateGUIDAndURLAndDistro(guid, &guid_length, crash_url, &crash_url_length,
+                              distro, &distro_length);
+  BreakpadInfo info = {0};
+  info.filename = NULL;
+  info.fd = descriptor.fd();
+  info.process_type = g_process_type;
+  info.process_type_length = my_strlen(g_process_type);
+  info.crash_url = crash_url;
+  info.crash_url_length = crash_url_length;
+  info.guid = guid;
+  info.guid_length = guid_length;
+  info.distro = distro;
+  info.distro_length = distro_length;
+  info.upload = false;
+  info.process_start_time = g_process_start_time;
+  HandleCrashDump(info);
+  return true;
+}
+#endif
+
 #if defined(ADDRESS_SANITIZER)
 extern "C"
 void __asan_set_error_report_callback(void (*cb)(const char*));
 
 extern "C"
 void AsanLinuxBreakpadCallback(const char* report) {
   g_asan_report_str = report;
   // Send minidump here.
   g_breakpad->SimulateSignalDelivery(SIGKILL);
 }
@@ skipping 34 matching lines @@
   g_breakpad = new ExceptionHandler(
       MinidumpDescriptor(dumps_path.value()),
       NULL,
       CrashDoneUpload,
       NULL,
       true,  // Install handlers.
       -1);   // Server file descriptor. -1 for in-process.
 #endif
 }
 
+#if !defined(OS_ANDROID)
 // Non-Browser = Extension, Gpu, Plugins, Ppapi and Renderer
 bool NonBrowserCrashHandler(const void* crash_context,
                             size_t crash_context_size,
                             void* context) {
   const int fd = reinterpret_cast<intptr_t>(context);
   int fds[2] = { -1, -1 };
   if (sys_socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) {
     static const char msg[] = "Failed to create socket for crash dumping.\n";
     WriteLog(msg, sizeof(msg)-1);
     return false;
   }
 
   // Start constructing the message to send to the browser.
   char guid[kGuidSize + 1] = {0};
   char crash_url[kMaxActiveURLSize + 1] = {0};
   char distro[kDistroSize + 1] = {0};
-  const size_t guid_len =
-      std::min(my_strlen(child_process_logging::g_client_id), kGuidSize);
-  const size_t crash_url_len =
-      std::min(my_strlen(child_process_logging::g_active_url),
-               kMaxActiveURLSize);
-  const size_t distro_len =
-      std::min(my_strlen(base::g_linux_distro), kDistroSize);
-  memcpy(guid, child_process_logging::g_client_id, guid_len);
-  memcpy(crash_url, child_process_logging::g_active_url, crash_url_len);
-  memcpy(distro, base::g_linux_distro, distro_len);
+  PopulateGUIDAndURLAndDistro(guid, NULL, crash_url, NULL, distro, NULL);
 
   char b;  // Dummy variable for sys_read below.
   const char* b_addr = &b;  // Get the address of |b| so we can create the
                             // expected /proc/[pid]/syscall content in the
                             // browser to convert namespace tids.
 
   // The length of the control message:
   static const unsigned kControlMsgSize = sizeof(fds);
   static const unsigned kControlMsgSpaceSize = CMSG_SPACE(kControlMsgSize);
   static const unsigned kControlMsgLenSize = CMSG_LEN(kControlMsgSize);
@@ skipping 57 matching lines @@
 
 #if defined(OS_ANDROID)
   // When false is returned, breakpad will continue to its minidump generator
   // and then to the HandlerCallback, which, in this case, is
   // CrashDoneNonBrowserAndroid().
   return false;
 #else
   return true;
 #endif
 }
+#endif
 
+#if defined(OS_ANDROID)
+void EnableNonBrowserCrashDumping(int minidump_fd) {
+  // This will guarantee that the BuildInfo has been initialized and subsequent
+  // calls will not require memory allocation.
+  base::android::BuildInfo::GetInstance();
+  child_process_logging::SetClientId("Android");
+
+  // On Android, the current sandboxing uses process isolation, in which the
+  // child process runs with a different UID. That breaks the normal crash
+  // reporting where the browser process generates the minidump by inspecting
+  // the child process. This is because the browser process now does not have
+  // the permission to access the states of the child process (as it has a
+  // different UID).
+  // TODO(jcivelli): http://b/issue?id=6776356 we should use a watchdog
+  // process forked from the renderer process that generates the minidump.
+  if (minidump_fd == -1) {
+    LOG(ERROR) << "Minidump file descriptor not found, crash reporting will "
+        " not work.";
+    return;
+  }
+  SetProcessStartTime();
+
+  g_is_crash_reporter_enabled = true;
+  // Save the process type (it is leaked).
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+  const std::string process_type =
+      parsed_command_line.GetSwitchValueASCII(switches::kProcessType);
+  const size_t process_type_len = process_type.size() + 1;
+  g_process_type = new char[process_type_len];
+  strncpy(g_process_type, process_type.c_str(), process_type_len);
+  new google_breakpad::ExceptionHandler(MinidumpDescriptor(minidump_fd),
+      NULL, CrashDoneInProcessNoUpload, NULL, true, -1);
+}
+#else
 void EnableNonBrowserCrashDumping() {
   const int fd = base::GlobalDescriptors::GetInstance()->Get(kCrashDumpSignal);
   g_is_crash_reporter_enabled = true;
   // We deliberately leak this object.
   DCHECK(!g_breakpad);
 
   ExceptionHandler::MinidumpCallback crash_done_callback = NULL;
 #if defined(OS_ANDROID)
   crash_done_callback = CrashDoneNonBrowserAndroid;
 #endif
 
   g_breakpad = new ExceptionHandler(
       MinidumpDescriptor("/tmp"),  // Unused but needed or Breakpad will assert.
       NULL,
       crash_done_callback,
       reinterpret_cast<void*>(fd),  // Param passed to the crash handler.
       true,
       -1);
   g_breakpad->set_crash_handler(NonBrowserCrashHandler);
 }
+#endif
 
 }  // namespace
 
+void LoadDataFromFD(google_breakpad::PageAllocator& allocator,
+                    int fd, bool close_fd, uint8_t** file_data, size_t* size) {
+  STAT_STRUCT st;
+  if (FSTAT_FUNC(fd, &st) != 0) {
+    static const char msg[] = "Cannot upload crash dump: stat failed\n";
+    WriteLog(msg, sizeof(msg) - 1);
+    if (close_fd)
+      IGNORE_RET(sys_close(fd));
+    return;
+  }
+
+  *file_data = reinterpret_cast<uint8_t*>(allocator.Alloc(st.st_size));
+  if (!(*file_data)) {
+    static const char msg[] = "Cannot upload crash dump: cannot alloc\n";
+    WriteLog(msg, sizeof(msg) - 1);
+    if (close_fd)
+      IGNORE_RET(sys_close(fd));
+    return;
+  }
+  my_memset(*file_data, 0xf, st.st_size);
+
+  *size = st.st_size;
+  int byte_read = sys_read(fd, *file_data, *size);
+  if (byte_read == -1) {
+    static const char msg[] = "Cannot upload crash dump: read failed\n";
+    WriteLog(msg, sizeof(msg) - 1);
+    if (close_fd)
+      IGNORE_RET(sys_close(fd));
+    return;
+  }
+
+  if (close_fd)
+    IGNORE_RET(sys_close(fd));
+}
+
 void LoadDataFromFile(google_breakpad::PageAllocator& allocator,
-                      const BreakpadInfo& info, const char* filename,
+                      const char* filename,
                       int* fd, uint8_t** file_data, size_t* size) {
   // WARNING: this code runs in a compromised context. It may not call into
   // libc nor allocate memory normally.
   *fd = sys_open(filename, O_RDONLY, 0);
   *size = 0;
 
   if (*fd < 0) {
     static const char msg[] = "Cannot upload crash dump: failed to open\n";
-    WriteLog(msg, sizeof(msg));
-    return;
-  }
-  STAT_STRUCT st;
-  if (FSTAT_FUNC(*fd, &st) != 0) {
-    static const char msg[] = "Cannot upload crash dump: stat failed\n";
-    WriteLog(msg, sizeof(msg));
-    IGNORE_RET(sys_close(*fd));
+    WriteLog(msg, sizeof(msg) - 1);
     return;
   }
 
-  *file_data = reinterpret_cast<uint8_t*>(allocator.Alloc(st.st_size));
-  if (!(*file_data)) {
-    static const char msg[] = "Cannot upload crash dump: cannot alloc\n";
-    WriteLog(msg, sizeof(msg));
-    IGNORE_RET(sys_close(*fd));
-    return;
-  }
-  my_memset(*file_data, 0xf, st.st_size);
-
-  *size = st.st_size;
-  sys_read(*fd, *file_data, *size);
-  IGNORE_RET(sys_close(*fd));
+  LoadDataFromFD(allocator, *fd, true, file_data, size);
 }
 
 void HandleCrashDump(const BreakpadInfo& info) {
   int dumpfd;
+  bool keep_fd = false;
   size_t dump_size;
   uint8_t* dump_data;
   google_breakpad::PageAllocator allocator;
-  LoadDataFromFile(allocator, info, info.filename,
-                   &dumpfd, &dump_data, &dump_size);
+
+  if (info.fd != -1) {
+    // Dump is provided with an open FD.
+    keep_fd = true;
+    dumpfd = info.fd;
+
+    // The FD is pointing to the end of the file.
+    // Rewind, we'll read the data next.
+    if (lseek(dumpfd, 0, SEEK_SET) == -1) {
+      static const char msg[] = "Cannot upload crash dump: failed to "
+          "reposition minidump FD\n";
+      WriteLog(msg, sizeof(msg) - 1);
+      IGNORE_RET(sys_close(dumpfd));
+      return;
+    }
+    LoadDataFromFD(allocator, info.fd, false, &dump_data, &dump_size);
+  } else {
+    // Dump is provided with a path.
+    keep_fd = false;
+    LoadDataFromFile(allocator, info.filename, &dumpfd, &dump_data, &dump_size);
+  }
+
+  // TODO(jcivelli): make log work when using FDs.
 #if defined(ADDRESS_SANITIZER)
   int logfd;
   size_t log_size;
   uint8_t* log_data;
   // Load the AddressSanitizer log into log_data.
   LoadDataFromFile(allocator, info, info.log_filename,
                    &logfd, &log_data, &log_size);
 #endif
 
   // We need to build a MIME block for uploading to the server. Since we are
   // going to fork and run wget, it needs to be written to a temp file.
   const int ufd = sys_open("/dev/urandom", O_RDONLY, 0);
   if (ufd < 0) {
     static const char msg[] = "Cannot upload crash dump because /dev/urandom"
                               " is missing\n";
     WriteLog(msg, sizeof(msg) - 1);
     return;
   }
 
   static const char temp_file_template[] =
       "/tmp/chromium-upload-XXXXXXXXXXXXXXXX";
   char temp_file[sizeof(temp_file_template)];
   int temp_file_fd = -1;
-  if (info.upload) {
-    memcpy(temp_file, temp_file_template, sizeof(temp_file_template));
-
-    for (unsigned i = 0; i < 10; ++i) {
-      uint64_t t;
-      sys_read(ufd, &t, sizeof(t));
-      write_uint64_hex(temp_file + sizeof(temp_file) - (16 + 1), t);
-
-      temp_file_fd = sys_open(temp_file, O_WRONLY | O_CREAT | O_EXCL, 0600);
-      if (temp_file_fd >= 0)
-        break;
-    }
-
-    if (temp_file_fd < 0) {
-      static const char msg[] = "Failed to create temporary file in /tmp: "
-          "cannot upload crash dump\n";
+  if (keep_fd) {
+    temp_file_fd = dumpfd;
+    // Rewind the destination, we are going to overwrite it.
+    if (lseek(dumpfd, 0, SEEK_SET) == -1) {
+      static const char msg[] = "Cannot upload crash dump: failed to "
+          "reposition minidump FD (2)\n";
       WriteLog(msg, sizeof(msg) - 1);
-      IGNORE_RET(sys_close(ufd));
+      IGNORE_RET(sys_close(dumpfd));
       return;
     }
   } else {
-    temp_file_fd = sys_open(info.filename, O_WRONLY, 0600);
-    if (temp_file_fd < 0) {
-      static const char msg[] = "Failed to save crash dump: failed to open\n";
-      WriteLog(msg, sizeof(msg) - 1);
-      IGNORE_RET(sys_close(ufd));
-      return;
+    if (info.upload) {
+      memcpy(temp_file, temp_file_template, sizeof(temp_file_template));
+
+      for (unsigned i = 0; i < 10; ++i) {
+        uint64_t t;
+        sys_read(ufd, &t, sizeof(t));
+        write_uint64_hex(temp_file + sizeof(temp_file) - (16 + 1), t);
+
+        temp_file_fd = sys_open(temp_file, O_WRONLY | O_CREAT | O_EXCL, 0600);
+        if (temp_file_fd >= 0)
+          break;
+      }
+
+      if (temp_file_fd < 0) {
+        static const char msg[] = "Failed to create temporary file in /tmp: "
+            "cannot upload crash dump\n";
+        WriteLog(msg, sizeof(msg) - 1);
+        IGNORE_RET(sys_close(ufd));
+        return;
+      }
+    } else {
+      temp_file_fd = sys_open(info.filename, O_WRONLY, 0600);
+      if (temp_file_fd < 0) {
+        static const char msg[] = "Failed to save crash dump: failed to open\n";
+        WriteLog(msg, sizeof(msg) - 1);
+        IGNORE_RET(sys_close(ufd));
+        return;
+      }
     }
   }
 
   // The MIME boundary is 28 hyphens, followed by a 64-bit nonce and a NUL.
   char mime_boundary[28 + 16 + 1];
   my_memset(mime_boundary, '-', 28);
   uint64_t boundary_rand;
   sys_read(ufd, &boundary_rand, sizeof(boundary_rand));
   write_uint64_hex(mime_boundary + 28, boundary_rand);
   mime_boundary[28 + 16] = 0;
@@ skipping 309 matching lines @@
   // Append a multipart boundary and the contents of the AddressSanitizer log.
   writer.AddBoundary();
   writer.AddFileContents(g_log_msg, log_data, log_size);
 #endif
   writer.AddEnd();
   writer.Flush();
 
   IGNORE_RET(sys_close(temp_file_fd));
 
 #if defined(OS_ANDROID)
-  __android_log_write(ANDROID_LOG_WARN,
-                      kGoogleBreakpad,
-                      "Output crash dump file:");
-  __android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad, info.filename);
+  if (info.filename) {
+    int filename_length = my_strlen(info.filename);
 
-  char pid_buf[kUint64StringSize];
-  uint64_t pid_str_len = my_uint64_len(info.pid);
-  my_uint64tos(pid_buf, info.pid, pid_str_len);
+    // If this was a file, we need to copy it to the right place and use the
+    // right file name so it gets uploaded by the browser.
+    const char* msg = "Output crash dump file:";
+    WriteLog(msg, sizeof(msg) - 1);
+    WriteLog(info.filename, filename_length - 1);
 
-  // -1 because we won't need the null terminator on the original filename.
-  size_t done_filename_len = my_strlen(info.filename) + pid_str_len - 1;
-  char* done_filename = reinterpret_cast<char*>(
-      allocator.Alloc(done_filename_len));
-  // Rename the file such that the pid is the suffix in order to signal other
-  // processes that the minidump is complete. The advantage of using the pid as
-  // the suffix is that it is trivial to associate the minidump with the
-  // crashed process.
-  // Finally, note strncpy prevents null terminators from
-  // being copied. Pad the rest with 0's.
-  my_strncpy(done_filename, info.filename, done_filename_len);
-  // Append the suffix a null terminator should be added.
-  my_strncat(done_filename, pid_buf, pid_str_len);
-  // Rename the minidump file to signal that it is complete.
-  if (rename(info.filename, done_filename)) {
-    __android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad, "Failed to rename:");
-    __android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad, info.filename);
-    __android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad, "to");
-    __android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad, done_filename);
+    char pid_buf[kUint64StringSize];
+    uint64_t pid_str_length = my_uint64_len(info.pid);
+    my_uint64tos(pid_buf, info.pid, pid_str_length);
+
+    // -1 because we won't need the null terminator on the original filename.
+    unsigned done_filename_len = filename_length -1 + pid_str_length;
+    char* done_filename = reinterpret_cast<char*>(
+        allocator.Alloc(done_filename_len));
+    // Rename the file such that the pid is the suffix in order signal to other
+    // processes that the minidump is complete. The advantage of using the pid
+    // as the suffix is that it is trivial to associate the minidump with the
+    // crashed process.
+    // Finally, note strncpy prevents null terminators from
+    // being copied. Pad the rest with 0's.
+    my_strncpy(done_filename, info.filename, done_filename_len);
+    // Append the suffix a null terminator should be added.
+    my_strncat(done_filename, pid_buf, pid_str_length);
+    // Rename the minidump file to signal that it is complete.
+    if (rename(info.filename, done_filename)) {
+      const char* failed_msg = "Failed to rename:";

[Lei Zhang, 2012/10/23 02:57:34]

There's a few instances of this. It's wrong. sizeof(failed_msg) below will
return the size of a char* and not the size of the string.

[Jay Civelli, 2012/10/23 20:39:55]

Good point, changed the char* to char[] in all the places so sizeof returns the
correct sizes.

+      WriteLog(failed_msg, sizeof(failed_msg) - 1);
+      WriteLog(info.filename, filename_length - 1);
+      const char* to_msg = "to";
+      WriteLog(to_msg, sizeof(to_msg) - 1);
+      WriteLog(done_filename, done_filename_len - 1);
+    }
   }
 #endif
 
   if (!info.upload)
     return;
 
   // The --header argument to wget looks like:
   //   --header=Content-Type: multipart/form-data; boundary=XYZ
   // where the boundary has two fewer leading '-' chars
   static const char header_msg[] =
@@ skipping 160 matching lines @@
   const std::string process_type =
       parsed_command_line.GetSwitchValueASCII(switches::kProcessType);
   if (process_type.empty()) {
     EnableCrashDumping(getenv(env_vars::kHeadless) != NULL);
   } else if (process_type == switches::kRendererProcess ||
              process_type == switches::kPluginProcess ||
              process_type == switches::kPpapiPluginProcess ||
              process_type == switches::kZygoteProcess ||
              process_type == switches::kGpuProcess) {
 #if defined(OS_ANDROID)
-    child_process_logging::SetClientId("Android");
+    NOTREACHED() << "Breakpad initialized with InitCrashReporter() instead of "
+      "InitNonBrowserCrashReporter in non browser process.";
+#else
+    InitNonBrowserCrashReporter();
 #endif
-    // We might be chrooted in a zygote or renderer process so we cannot call

[Lei Zhang, 2012/10/23 02:57:34]

I don't think this block should be removed for non-Android?

[Jay Civelli, 2012/10/23 20:39:55]

Oops, it's now back.

-    // GetCollectStatsConsent because that needs access the the user's home
-    // dir. Instead, we set a command line flag for these processes.
-    // Even though plugins are not chrooted, we share the same code path for
-    // simplicity.
-    if (!parsed_command_line.HasSwitch(switches::kEnableCrashReporter))
-      return;
-    // Get the guid and linux distro from the command line switch.
-    std::string switch_value =
-        parsed_command_line.GetSwitchValueASCII(switches::kEnableCrashReporter);
-    size_t separator = switch_value.find(",");
-    if (separator != std::string::npos) {
-      child_process_logging::SetClientId(switch_value.substr(0, separator));
-      base::SetLinuxDistro(switch_value.substr(separator + 1));
-    } else {
-      child_process_logging::SetClientId(switch_value);
-    }
-    EnableNonBrowserCrashDumping();
+    LOG(INFO) << "Non Browser crash dumping enabled for: " << process_type;
   }
-
-  // Set the base process start time value.
-  struct timeval tv;
-  if (!gettimeofday(&tv, NULL))
-    g_process_start_time = timeval_to_ms(&tv);
-  else
-    g_process_start_time = 0;
+  SetProcessStartTime();
 
   logging::SetDumpWithoutCrashingFunction(&DumpProcess);
 #if defined(ADDRESS_SANITIZER)
   // Register the callback for AddressSanitizer error reporting.
   __asan_set_error_report_callback(AsanLinuxBreakpadCallback);
 #endif
 }
 
+#if defined(OS_ANDROID)
+void InitNonBrowserCrashReporterForAndroid(int minidump_fd) {
+  // We might be chrooted in a zygote or renderer process so we cannot call
+  // GetCollectStatsConsent because that needs access the the user's home
+  // dir. Instead, we set a command line flag for these processes.
+  // Even though plugins are not chrooted, we share the same code path for
+  // simplicity.
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+  if (!parsed_command_line.HasSwitch(switches::kEnableCrashReporter))
+    return;
+
+  // Get the guid and linux distro from the command line switch.
+  std::string switch_value =
+      parsed_command_line.GetSwitchValueASCII(switches::kEnableCrashReporter);
+  size_t separator = switch_value.find(",");
+  if (separator != std::string::npos) {
+    child_process_logging::SetClientId(switch_value.substr(0, separator));
+    // The notion of a distro doesn't make sense in Android.
+    base::SetLinuxDistro(switch_value.substr(separator + 1));

[Lei Zhang, 2012/10/23 02:57:34]

This seems silly. What does Android pass as the value to kEnableCrashReporter?

[Jay Civelli, 2012/10/23 20:39:55]

You are right, this is silly, we know it's Android and we set that in
EnableNonBrowserCrashDumping.
Simplified all this.

+  } else {
+    child_process_logging::SetClientId(switch_value);
+  }
+  EnableNonBrowserCrashDumping(minidump_fd);
+}
+#endif  // OS_ANDROID
+
 bool IsCrashReporterEnabled() {
   return g_is_crash_reporter_enabled;
 }