Update Crashpad to 1ebedb05dde4fccb9d9459062a3a9fa9cb28bd5a

74a56c256b10 Prepare for removal of is_posix from the Fuchsia build
ba0bd63254a7 Use clang ref:goma instead of ref:latest
1ebedb05dde4 linux: Fix failing exception handler server test

Bug: 812974
Change-Id: I9073a1c615356a4dc42973a81674789a33327235
Reviewed-on: https://chromium-review.googlesource.com/998733Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548578}

third_party/crashpad/README.chromium

@@ -2,7 +2,7 @@ Name: Crashpad
 Short Name: crashpad
 URL: https://crashpad.chromium.org/
 Version: unknown
-Revision: 08ce02c3527674f331d4ebfd5ac0bdc4748c4661
+Revision: 1ebedb05dde4fccb9d9459062a3a9fa9cb28bd5a
 License: Apache 2.0
 License File: crashpad/LICENSE
 Security Critical: yes

third_party/crashpad/crashpad/DEPS

@@ -29,7 +29,7 @@ deps = {
       '5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      'd42eb410123667fe94427986d2616795897efa0c',
+      '6e0fdb2e4966ec44b1ce7b8464fd7c80d1b59203',
   'crashpad/third_party/zlib/zlib':
       Var('chromium_git') + '/chromium/src/third_party/zlib@' +
       '13dc246a58e4b72104d35f9b1809af95221ebda7',
@@ -120,6 +120,8 @@ hooks = [
     # Linux build host and vice-versa. https://crbug.com/789364. This package is
     # only updated when the solution in .gclient includes an entry like:
     #   "custom_vars": { "pull_linux_clang": True }
+    # The ref used is "goma". This is like "latest", but is considered a more
+    # stable latest by the Fuchsia toolchain team.
     'name': 'clang_linux',
     'pattern': '.',
     'condition': 'checkout_linux and pull_linux_clang',
@@ -129,7 +131,7 @@ hooks = [
       # sic, using Fuchsia team's generic build of clang for linux-amd64 to
       # build for linux-amd64 target too.
       'fuchsia/clang/linux-amd64',
-      'latest',
+      'goma',
       '-root', 'crashpad/third_party/linux/clang/linux-amd64',
       '-log-level', 'info',
     ],
@@ -137,7 +139,7 @@ hooks = [
   {
     # If using a local clang ("pull_linux_clang" above), also pull down a
     # sysroot.
-    'name': 'clang_linux',
+    'name': 'sysroot_linux',
     'pattern': '.',
     'condition': 'checkout_linux and pull_linux_clang',
     'action': [
@@ -147,6 +149,7 @@ hooks = [
   {
     # Same rationale for using "install" rather than "ensure" as for first clang
     # package. https://crbug.com/789364.
+    # Same rationale for using "goma" instead of "latest" as clang_linux above.
     'name': 'fuchsia_clang_mac',
     'pattern': '.',
     'condition': 'checkout_fuchsia and host_os == "mac"',
@@ -154,7 +157,7 @@ hooks = [
       'cipd',
       'install',
       'fuchsia/clang/mac-amd64',
-      'latest',
+      'goma',
       '-root', 'crashpad/third_party/fuchsia/clang/mac-amd64',
       '-log-level', 'info',
     ],
@@ -162,6 +165,7 @@ hooks = [
   {
     # Same rationale for using "install" rather than "ensure" as for first clang
     # package. https://crbug.com/789364.
+    # Same rationale for using "goma" instead of "latest" as clang_linux above.
     'name': 'fuchsia_clang_linux',
     'pattern': '.',
     'condition': 'checkout_fuchsia and host_os == "linux"',
@@ -169,7 +173,7 @@ hooks = [
       'cipd',
       'install',
       'fuchsia/clang/linux-amd64',
-      'latest',
+      'goma',
       '-root', 'crashpad/third_party/fuchsia/clang/linux-amd64',
       '-log-level', 'info',
     ],

third_party/crashpad/crashpad/handler/linux/exception_handler_server_test.cc

@@ -141,6 +141,25 @@ class MockPtraceStrategyDecider : public PtraceStrategyDecider {
   ~MockPtraceStrategyDecider() {}
 
   Strategy ChooseStrategy(int sock, const ucred& client_credentials) override {
+    if (strategy_ == Strategy::kUseBroker) {
+      ServerToClientMessage message = {};
+      message.type = ServerToClientMessage::kTypeForkBroker;
+
+      Errno status;
+      bool result = LoggingWriteFile(sock, &message, sizeof(message)) &&
+                    LoggingReadFileExactly(sock, &status, sizeof(status));
+      EXPECT_TRUE(result);
+
+      if (!result) {
+        return Strategy::kError;
+      }
+
+      if (status != 0) {
+        errno = status;
+        ADD_FAILURE() << ErrnoMessage("Handler Client ForkBroker");
+        return Strategy::kNoPtrace;
+      }
+    }
     return strategy_;
   }
 

third_party/crashpad/crashpad/snapshot/BUILD.gn

@@ -56,7 +56,7 @@ static_library("snapshot") {
     "unloaded_module_snapshot.h",
   ]
 
-  if (crashpad_is_posix) {
+  if (crashpad_is_posix || crashpad_is_fuchsia) {
     sources += [
       "posix/timezone.cc",
       "posix/timezone.h",

third_party/crashpad/crashpad/test/BUILD.gn

@@ -44,7 +44,7 @@ static_library("test") {
     "test_paths.h",
   ]
 
-  if (crashpad_is_posix) {
+  if (crashpad_is_posix || crashpad_is_fuchsia) {
     sources += [ "scoped_temp_dir_posix.cc" ]
 
     if (!crashpad_is_fuchsia) {
@@ -140,6 +140,8 @@ source_set("test_test") {
     "test_paths_test.cc",
   ]
 
+  # TODO(crbug.com/812974): Remove !crashpad_is_fuchsia when Fuchsia is no
+  # longer treated as a posix platform.
   if (crashpad_is_posix && !crashpad_is_fuchsia) {
     sources += [ "multiprocess_posix_test.cc" ]
   }
@@ -155,9 +157,6 @@ source_set("test_test") {
     ]
   }
 
-  if (!crashpad_is_fuchsia) {
-  }
-
   deps = [
     ":test",
     "../compat",

third_party/crashpad/crashpad/util/BUILD.gn

@@ -160,7 +160,7 @@ static_library("util") {
     "thread/worker_thread.h",
   ]
 
-  if (crashpad_is_posix) {
+  if (crashpad_is_posix || crashpad_is_fuchsia) {
     sources += [
       "file/directory_reader_posix.cc",
       "file/file_io_posix.cc",
@@ -512,7 +512,7 @@ source_set("util_test") {
     sources += [ "net/http_transport_test.cc" ]
   }
 
-  if (crashpad_is_posix) {
+  if (crashpad_is_posix || crashpad_is_fuchsia) {
     if (!crashpad_is_fuchsia) {
       sources += [
         "posix/process_info_test.cc",