Don't reuse the minidump descriptor for the crash signal pipe.

android_webview/crash_reporter/aw_microdump_crash_reporter.cc

 // Copyright 2015 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 "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
 
 #include "android_webview/common/aw_version_info_values.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/scoped_native_library.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/app/crash_reporter_client.h"
 #include "content/public/common/content_switches.h"
 
 namespace android_webview {
 namespace crash_reporter {
 
 namespace {
 
 class AwCrashReporterClient : public ::crash_reporter::CrashReporterClient {
  public:
-  AwCrashReporterClient() : dump_fd_(-1) {}
+  AwCrashReporterClient() : dump_fd_(-1), crash_signal_fd_(-1) {}
 
   // Does not use lock, can only be called immediately after creation.
-  void set_crash_signal_fd(int fd) { dump_fd_ = fd; }
+  void set_crash_signal_fd(int fd) { crash_signal_fd_ = fd; }
 
   // crash_reporter::CrashReporterClient implementation.
   bool IsRunningUnattended() override { return false; }
   bool GetCollectStatsConsent() override { return false; }
 
   void GetProductNameAndVersion(const char** product_name,
                                 const char** version) override {
     *product_name = "WebView";
     *version = PRODUCT_VERSION;
   }
   // Microdumps are always enabled in WebView builds, conversely to what happens
   // in the case of the other Chrome for Android builds (where they are enabled
   // only when NO_UNWIND_TABLES == 1).
   bool ShouldEnableBreakpadMicrodumps() override { return true; }
 
   int GetAndroidMinidumpDescriptor() override { return dump_fd_; }
+  int GetAndroidCrashSignalFD() override { return crash_signal_fd_; }
 
   bool DumpWithoutCrashingToFd(int fd) {
     DCHECK(dump_fd_ == -1);
     base::AutoLock lock(dump_lock_);
     dump_fd_ = fd;
     base::debug::DumpWithoutCrashing();
     dump_fd_ = -1;
     return true;
   }
 
  private:
   int dump_fd_;
+  int crash_signal_fd_;
   base::Lock dump_lock_;
   DISALLOW_COPY_AND_ASSIGN(AwCrashReporterClient);
 };
 
 base::LazyInstance<AwCrashReporterClient>::Leaky g_crash_reporter_client =
     LAZY_INSTANCE_INITIALIZER;
 
 bool g_enabled = false;
 
 #if defined(ARCH_CPU_X86_FAMILY)
@@ skipping 75 matching lines @@
     const std::string& gpu_fingerprint) {
   breakpad::AddGpuFingerprintToMicrodumpCrashHandler(gpu_fingerprint);
 }
 
 bool DumpWithoutCrashingToFd(int fd) {
   return g_crash_reporter_client.Pointer()->DumpWithoutCrashingToFd(fd);
 }
 
 }  // namespace crash_reporter
 }  // namespace android_webview