Fix use_custom_libcxx=false build on Linux

Change-Id: Iaa5a1548901498e8d38b6e92bda8c301af2fd631
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/985416Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546903}

base/json/string_escape_fuzzer.cc

@@ -4,6 +4,8 @@
 
 #include "base/json/string_escape.h"
 
+#include <memory>
+
 std::string escaped_string;
 
 // Entry point for LibFuzzer.

net/cert/nss_cert_database_unittest.cc

@@ -124,7 +124,10 @@ class CertDatabaseNSSTest : public testing::Test {
   }
 
   std::unique_ptr<NSSCertDatabase> cert_db_;
-  const CertificateList empty_cert_list_;
+  // When building with libstdc++, |empty_cert_list_| does not have a default
+  // constructor.  Initialize it explicitly so that CertDatabaseNSSTest gets a
+  // default constructor.
+  const CertificateList empty_cert_list_ = CertificateList();
   crypto::ScopedTestNSSDB test_nssdb_;
   crypto::ScopedPK11Slot public_slot_;
 };

sandbox/win/fuzzer/fuzzer_types.h

@@ -14,7 +14,13 @@
 // captured by the fuzzing harness.
 
 // Disable exceptions.
+#if defined(__try)
+#undef __try
+#endif
 #define __try if(true)
+#if defined(__except)
+#undef __except
+#endif
 #define __except(...) if(false)
 
 // Windows types used in sandbox.