Chromium -> Mojo roll.

base/memory/discardable_memory.cc

Index: base/memory/discardable_memory.cc
diff --git a/base/memory/discardable_memory.cc b/base/memory/discardable_memory.cc
index 0e3b58a356390ba604aea22d3f692701eba09fff..d50f1853e197021c8e8e4c0ace7d110f78c52db3 100644
--- a/base/memory/discardable_memory.cc
+++ b/base/memory/discardable_memory.cc
@@ -4,14 +4,12 @@
 
 #include "base/memory/discardable_memory.h"
 
-#include "base/memory/discardable_memory_shmem.h"
-
 namespace base {
 
-// static
-scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemory(
-    size_t size) {
-  return make_scoped_ptr(new internal::DiscardableMemoryShmem(size));
+DiscardableMemory::DiscardableMemory() {
+}
+
+DiscardableMemory::~DiscardableMemory() {
 }
 
 }  // namespace base