commit f6f1773d5f2f67f9b27de38f52bb4623fa799789
author thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Sep 26 21:06:40 2012
committer thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Sep 26 21:06:40 2012
tree 349259821b33644e3106035eff28185267a1467c
parent f827aa4078adda4e5dbfa6b6ffc964487dd50103

Roll DEPS for Breakpad r1020:1052.

BUG=152278
Review URL: https://codereview.chromium.org/10982049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158883 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

diff --git a/DEPS b/DEPS
index faecde6..f99d82a 100644
--- a/DEPS
+++ b/DEPS
@@ -44,7 +44,7 @@
 
 deps = {
   "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1020",
+    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1052",
 
   "src/googleurl":
     (Var("googlecode_url") % "google-url") + "/trunk@179",

chrome/app/breakpad_linux.cc

diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc
index 43841ec..5ef1470 100644
--- a/chrome/app/breakpad_linux.cc
+++ b/chrome/app/breakpad_linux.cc
@@ -56,7 +56,7 @@
 #endif
 
 #if defined(ADDRESS_SANITIZER)
-#include <ucontext.h> // for getcontext().
+#include <ucontext.h>  // for getcontext().
 #endif
 
 #if defined(OS_ANDROID)
@@ -142,7 +142,7 @@
   return len;
 }
 
-// uint64_t version of my_itos() from
+// uint64_t version of my_uitos() from
 // breakpad/src/common/linux/linux_libc_support.h. Convert a non-negative
 // integer to a string (not null-terminated).
 void my_uint64tos(char* output, uint64_t i, unsigned i_len) {
@@ -304,8 +304,8 @@
 
   while (msg_length) {
     char num[16];
-    const unsigned num_len = my_int_len(++i);
-    my_itos(num, i, num_len);
+    const unsigned num_len = my_uint_len(++i);
+    my_uitos(num, i, num_len);
 
     size_t chunk_len = std::min(chunk_size, msg_length);
 
@@ -685,14 +685,14 @@
 void HandleCrashDump(const BreakpadInfo& info) {
   int dumpfd;
   size_t dump_size;
-  uint8_t *dump_data;
+  uint8_t* dump_data;
   google_breakpad::PageAllocator allocator;
   LoadDataFromFile(allocator, info, info.filename,
                    &dumpfd, &dump_data, &dump_size);
 #if defined(ADDRESS_SANITIZER)
   int logfd;
   size_t log_size;
-  uint8_t *log_data;
+  uint8_t* log_data;
   // Load the AddressSanitizer log into log_data.
   LoadDataFromFile(allocator, info, info.log_filename,
                    &logfd, &log_data, &log_size);