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

content/child/child_discardable_shared_memory_manager_browsertest.cc

 // Copyright 2015 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/bind.h"
 #include "base/command_line.h"
 #include "base/memory/discardable_memory.h"
 #include "content/child/child_discardable_shared_memory_manager.h"
 #include "content/child/child_thread_impl.h"
 #include "content/common/host_discardable_shared_memory_manager.h"
@@ skipping 42 matching lines @@
   const size_t kSize = 1024 * 1024;  // 1MiB.
 
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   scoped_ptr<base::DiscardableMemory> memory;
   PostTaskToInProcessRendererAndWait(base::Bind(
       &ChildDiscardableSharedMemoryManagerBrowserTest::AllocateLockedMemory,
       kSize, &memory));
 
   ASSERT_TRUE(memory);
-  void* addr = memory->Memory();
+  void* addr = memory->data();
   ASSERT_NE(nullptr, addr);
 
   PostTaskToInProcessRendererAndWait(
       base::Bind(&ChildDiscardableSharedMemoryManagerBrowserTest::UnlockMemory,
                  memory.get()));
 
   // Purge all unlocked memory.
   HostDiscardableSharedMemoryManager::current()->SetMemoryLimit(0);
 
   bool result = true;
@@ skipping 15 matching lines @@
   const size_t kNumberOfInstances = 1024 + 1;  // >4GiB total.
 
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   scoped_ptr<base::DiscardableMemory> instances[kNumberOfInstances];
   for (auto& memory : instances) {
     PostTaskToInProcessRendererAndWait(base::Bind(
         &ChildDiscardableSharedMemoryManagerBrowserTest::AllocateLockedMemory,
         kLargeSize, &memory));
     ASSERT_TRUE(memory);
-    void* addr = memory->Memory();
+    void* addr = memory->data();
     ASSERT_NE(nullptr, addr);
     PostTaskToInProcessRendererAndWait(base::Bind(
         &ChildDiscardableSharedMemoryManagerBrowserTest::UnlockMemory,
         memory.get()));
   }
 
   for (auto& memory : instances) {
     PostTaskToInProcessRendererAndWait(
         base::Bind(&ChildDiscardableSharedMemoryManagerBrowserTest::FreeMemory,
                    base::Passed(&memory)));
@@ skipping 21 matching lines @@
             kSize);
 
   PostTaskToInProcessRendererAndWait(base::Bind(
       &ChildDiscardableSharedMemoryManagerBrowserTest::ReleaseFreeMemory));
 
   EXPECT_EQ(HostDiscardableSharedMemoryManager::current()->GetBytesAllocated(),
             0u);
 }
 
 }  // content