diff --git a/DEPS b/DEPS
index acdcbf9ec43c4e..29bbe873738ed1 100644
--- a/DEPS
+++ b/DEPS
@@ -804,7 +804,7 @@ deps = {
   },
 
   'src/third_party/breakpad/breakpad':
-    Var('chromium_git') + '/breakpad/breakpad.git' + '@' + 'f32b83eb08e9ee158d3037b2114357187fd45a05',
+    Var('chromium_git') + '/breakpad/breakpad.git' + '@' + 'a2d3e8b2d5f8f3de06eefec50566c9a54d7cf0a6',
 
   'src/third_party/byte_buddy': {
       'packages': [
diff --git a/chromecast/crash/cast_crashdump_uploader.cc b/chromecast/crash/cast_crashdump_uploader.cc
index 3a278f8c51594b..6920ebb63955fb 100644
--- a/chromecast/crash/cast_crashdump_uploader.cc
+++ b/chromecast/crash/cast_crashdump_uploader.cc
@@ -117,7 +117,7 @@ bool CastCrashdumpUploader::Upload(std::string* response) {
 
   LOG(INFO) << "Sending request to " << data_.crash_server;
 
-  int http_status_code;
+  long http_status_code;
   std::string http_header_data;
   return http_layer_->SendRequest(data_.crash_server,
                                   parameters_,
diff --git a/chromecast/crash/cast_crashdump_uploader_unittest.cc b/chromecast/crash/cast_crashdump_uploader_unittest.cc
index 941cce26bab36c..a5fc5fe21d4682 100644
--- a/chromecast/crash/cast_crashdump_uploader_unittest.cc
+++ b/chromecast/crash/cast_crashdump_uploader_unittest.cc
@@ -25,7 +25,7 @@ class MockLibcurlWrapper : public google_breakpad::LibcurlWrapper {
   MOCK_METHOD5(SendRequest,
                bool(const std::string& url,
                     const std::map<std::string, std::string>& parameters,
-                    int* http_status_code,
+                    long* http_status_code,
                     std::string* http_header_data,
                     std::string* http_response_data));
 };
diff --git a/third_party/breakpad/BUILD.gn b/third_party/breakpad/BUILD.gn
index 72e171e233632d..14313c7de80f9d 100644
--- a/third_party/breakpad/BUILD.gn
+++ b/third_party/breakpad/BUILD.gn
@@ -471,6 +471,10 @@ if (is_linux || is_android) {
       sources = [
         "breakpad/src/common/linux/http_upload.cc",
         "breakpad/src/common/linux/http_upload.h",
+        "breakpad/src/common/linux/libcurl_wrapper.cc",
+        "breakpad/src/common/linux/libcurl_wrapper.h",
+        "breakpad/src/common/linux/symbol_collector_client.cc",
+        "breakpad/src/common/linux/symbol_collector_client.h",
         "breakpad/src/common/linux/symbol_upload.cc",
         "breakpad/src/common/linux/symbol_upload.h",
         "breakpad/src/tools/linux/symupload/sym_upload.cc",
@@ -600,6 +604,7 @@ if (is_linux || is_android) {
       "breakpad/src/common/linux/elfutils.h",
       "breakpad/src/common/linux/file_id.cc",
       "breakpad/src/common/linux/file_id.h",
+      "breakpad/src/common/linux/breakpad_getcontext.S",
       "breakpad/src/common/linux/google_crashdump_uploader.cc",
       "breakpad/src/common/linux/google_crashdump_uploader.h",
       "breakpad/src/common/linux/guid_creator.cc",
@@ -629,10 +634,6 @@ if (is_linux || is_android) {
       cflags = [ "-marm" ]
     }
 
-    if (is_android) {
-      sources += [ "breakpad/src/common/android/breakpad_getcontext.S" ]
-    }
-
     libs = [ "dl" ]
 
     include_dirs = [
@@ -685,6 +686,7 @@ if (is_linux || is_android) {
       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
       "breakpad/src/common/linux/file_id_unittest.cc",
       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
@@ -735,8 +737,6 @@ if (is_linux || is_android) {
 
     if (is_android) {
       use_raw_android_executable = true
-      sources +=
-          [ "breakpad/src/common/android/breakpad_getcontext_unittest.cc" ]
       libs = [ "log" ]
       extra_dist_files = [ "$root_out_dir/linux_dumper_unittest_helper" ]
     }