Update from https://crrev.com/309717

base/memory/discardable_memory_unittest.cc

Index: base/memory/discardable_memory_unittest.cc
diff --git a/base/memory/discardable_memory_unittest.cc b/base/memory/discardable_memory_unittest.cc
index 600475ee06bc92e0fd51254761b7b9f6600b897e..45104131a95772b709af72050e7d02d4aa35c62b 100644
--- a/base/memory/discardable_memory_unittest.cc
+++ b/base/memory/discardable_memory_unittest.cc
@@ -105,6 +105,9 @@ TEST_P(DiscardableMemoryTest, UnlockedMemoryAccessCrashesInDebugMode) {
 
 // Test behavior when creating enough instances that could use up a 32-bit
 // address space.
+// This is disabled under AddressSanitizer on Windows as it crashes (by design)
+// on OOM. See http://llvm.org/PR22026 for the details.
+#if !defined(ADDRESS_SANITIZER) || !defined(OS_WIN)
 TEST_P(DiscardableMemoryTest, AddressSpace) {
   const size_t kLargeSize = 4 * 1024 * 1024;  // 4MiB.
   const size_t kNumberOfInstances = 1024 + 1;  // >4GiB total.
@@ -118,6 +121,7 @@ TEST_P(DiscardableMemoryTest, AddressSpace) {
     memory->Unlock();
   }
 }
+#endif
 
 std::vector<DiscardableMemoryType> GetSupportedDiscardableMemoryTypes() {
   std::vector<DiscardableMemoryType> supported_types;