Reverting 24220.

chrome/browser/renderer_host/render_crash_handler_host_linux.cc

 // Copyright (c) 2009 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 "chrome/browser/renderer_host/render_crash_handler_host_linux.h"
 
 #include <dirent.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <string>
 #include <vector>
 
 #include "base/eintr_wrapper.h"
-#include "base/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "breakpad/linux/exception_handler.h"
 #include "breakpad/linux/linux_dumper.h"
 #include "breakpad/linux/minidump_writer.h"
 #include "chrome/app/breakpad_linux.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/common/chrome_paths.h"
 
 // expected prefix of the target of the /proc/self/fd/%d link for a socket
 static const char kSocketLinkPrefix[] = "socket:[";
 
 // Parse a symlink in /proc/pid/fd/$x and return the inode number of the
 // socket.
 //   inode_out: (output) set to the inode number on success
 //   path: e.g. /proc/1234/fd/5 (must be a UNIX domain socket descriptor)
 //   log: if true, log messages about failure details
 static bool ProcPathGetInode(uint64_t* inode_out, const char* path,
@@ skipping 257 matching lines @@
     return;
   }
 
   if (!FindProcessHoldingSocket(&crashing_pid, inode_number - 1)) {
     LOG(WARNING) << "Failed to find process holding other end of crash reply "
                     "socket";
     HANDLE_EINTR(close(signal_fd));
     return;
   }
 
-  bool upload = true;
-  FilePath dumps_path("/tmp");
-  if (getenv("CHROME_HEADLESS")) {
-    upload = false;
-    PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
-  }
   const uint64 rand = base::RandUint64();
   const std::string minidump_filename =
-      StringPrintf("%s/chromium-renderer-minidump-%016" PRIx64 ".dmp",
-                   dumps_path.value().c_str(), rand);
+      StringPrintf("/tmp/chromium-renderer-minidump-%016" PRIx64 ".dmp", rand);
   if (!google_breakpad::WriteMinidump(minidump_filename.c_str(),
                                       crashing_pid, crash_context,
                                       kCrashContextSize)) {
     LOG(ERROR) << "Failed to write crash dump for pid " << crashing_pid;
     HANDLE_EINTR(close(signal_fd));
   }
 
   // Send the done signal to the renderer: it can exit now.
   memset(&msg, 0, sizeof(msg));
   struct iovec done_iov;
   done_iov.iov_base = const_cast<char*>("\x42");
   done_iov.iov_len = 1;
   msg.msg_iov = &done_iov;
   msg.msg_iovlen = 1;
 
   HANDLE_EINTR(sendmsg(signal_fd, &msg, MSG_DONTWAIT | MSG_NOSIGNAL));
   HANDLE_EINTR(close(signal_fd));
 
   BreakpadInfo info;
   info.filename = minidump_filename.c_str();
   info.process_type = "renderer";
   info.process_type_length = 8;
   info.crash_url = crash_url;
   info.crash_url_length = strlen(crash_url);
   info.guid = guid;
   info.guid_length = strlen(guid);
   info.distro = distro;
   info.distro_length = strlen(distro);
-  info.upload = upload;
-  HandleCrashDump(info);
+  UploadCrashDump(info);
 }
 
 void RenderCrashHandlerHostLinux::WillDestroyCurrentMessageLoop() {
   file_descriptor_watcher_.StopWatchingFileDescriptor();
 }