Update from https://crrev.com/309717

base/memory/discardable_memory_unittest.cc

 // Copyright (c) 2013 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 "base/memory/discardable_memory.h"
 
 #include <algorithm>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 87 matching lines @@
   const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize));
   ASSERT_TRUE(memory);
   memory->Unlock();
   ASSERT_DEATH_IF_SUPPORTED(
       { *static_cast<int*>(memory->Memory()) = 0xdeadbeef; }, ".*");
 }
 #endif
 
 // 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.
 
   scoped_ptr<DiscardableMemory> instances[kNumberOfInstances];
   for (auto& memory : instances) {
     memory = CreateLockedMemory(kLargeSize);
     ASSERT_TRUE(memory);
     void* addr = memory->Memory();
     ASSERT_NE(nullptr, addr);
     memory->Unlock();
   }
 }
+#endif
 
 std::vector<DiscardableMemoryType> GetSupportedDiscardableMemoryTypes() {
   std::vector<DiscardableMemoryType> supported_types;
   DiscardableMemory::GetSupportedTypes(&supported_types);
   return supported_types;
 }
 
 INSTANTIATE_TEST_CASE_P(
     DiscardableMemoryTests,
     DiscardableMemoryTest,
     ::testing::ValuesIn(GetSupportedDiscardableMemoryTypes()));
 
 }  // namespace
 }  // namespace base