base: Rename DiscardableMemory::Memory() to ::data().

mojo/services/html_viewer/discardable_memory_allocator.cc

Index: mojo/services/html_viewer/discardable_memory_allocator.cc
diff --git a/mojo/services/html_viewer/discardable_memory_allocator.cc b/mojo/services/html_viewer/discardable_memory_allocator.cc
index 569c3d0d3908cd8f9ed5c86da4a69d721a0d8d36..a75ac63b1dc3844811942aa5f60540d64aeb0d42 100644
--- a/mojo/services/html_viewer/discardable_memory_allocator.cc
+++ b/mojo/services/html_viewer/discardable_memory_allocator.cc
@@ -18,7 +18,7 @@ class DiscardableMemoryAllocator::OwnedMemoryChunk {
   OwnedMemoryChunk(size_t size, DiscardableMemoryAllocator* allocator)
       : is_locked_(true),
         size_(size),
-        memory_(new uint8_t[size]),
+        data_(new uint8_t[size]),
         allocator_(allocator),
         weak_factory_(this) {}
   ~OwnedMemoryChunk() {}
@@ -37,9 +37,9 @@ class DiscardableMemoryAllocator::OwnedMemoryChunk {
 
   bool is_locked() const { return is_locked_; }
   size_t size() const { return size_; }
-  void* Memory() const {
+  void* data() const {
     DCHECK(is_locked_);
-    return memory_.get();
+    return data_.get();
   }
 
   base::WeakPtr<OwnedMemoryChunk> GetWeakPtr() {
@@ -49,7 +49,7 @@ class DiscardableMemoryAllocator::OwnedMemoryChunk {
  private:
   bool is_locked_;
   size_t size_;
-  scoped_ptr<uint8_t[]> memory_;
+  scoped_ptr<uint8_t[]> data_;
   DiscardableMemoryAllocator* allocator_;
 
   std::list<OwnedMemoryChunk*>::iterator unlocked_position_;
@@ -89,9 +89,9 @@ class DiscardableMemoryChunkImpl : public base::DiscardableMemory {
     memory_chunk_->Unlock();
   }
 
-  void* Memory() const override {
+  void* data() const override {
     if (memory_chunk_)
-      return memory_chunk_->Memory();
+      return memory_chunk_->data();
     return nullptr;
   }