Update from https://crrev.com/327068

base/test/test_discardable_memory_allocator.cc

Index: base/test/test_discardable_memory_allocator.cc
diff --git a/base/test/test_discardable_memory_allocator.cc b/base/test/test_discardable_memory_allocator.cc
index cb2cccf111373a77d3c5e7659dc0977fa17f5d97..23d529c324d74677ca0bba6ed37d94b606ea3aff 100644
--- a/base/test/test_discardable_memory_allocator.cc
+++ b/base/test/test_discardable_memory_allocator.cc
@@ -13,15 +13,15 @@ namespace {
 
 class DiscardableMemoryImpl : public DiscardableMemory {
  public:
-  explicit DiscardableMemoryImpl(size_t size) : memory_(new uint8_t[size]) {}
+  explicit DiscardableMemoryImpl(size_t size) : data_(new uint8_t[size]) {}
 
   // Overridden from DiscardableMemory:
   bool Lock() override { return false; }
   void Unlock() override {}
-  void* Memory() const override { return memory_.get(); }
+  void* data() const override { return data_.get(); }
 
  private:
-  scoped_ptr<uint8_t[]> memory_;
+  scoped_ptr<uint8_t[]> data_;
 };
 
 }  // namespace