Refactor DiscardableMemory for the upcoming DiscardableMemoryAllocator.

webkit/child/web_discardable_memory_impl.h

Index: webkit/child/web_discardable_memory_impl.h
diff --git a/webkit/child/web_discardable_memory_impl.h b/webkit/child/web_discardable_memory_impl.h
index f2ad3287a010c251ac33d428ece3bec91391e6d3..82de1c4b7c9c33f425ce65840184d03f1f78c59a 100644
--- a/webkit/child/web_discardable_memory_impl.h
+++ b/webkit/child/web_discardable_memory_impl.h
@@ -5,6 +5,7 @@
 #ifndef WEBKIT_CHILD_WEB_DISCARDABLE_MEMORY_IMPL_H_
 #define WEBKIT_CHILD_WEB_DISCARDABLE_MEMORY_IMPL_H_
 
+#include "base/basictypes.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/public/platform/WebDiscardableMemory.h"
@@ -21,21 +22,20 @@ namespace webkit_glue {
 class WEBKIT_CHILD_EXPORT WebDiscardableMemoryImpl
     : NON_EXPORTED_BASE(public WebKit::WebDiscardableMemory) {
  public:
-  WebDiscardableMemoryImpl();
   virtual ~WebDiscardableMemoryImpl();
 
-  // WebKit::WebDiscardableMemory implementation.
+  static scoped_ptr<WebDiscardableMemoryImpl> CreateLockedMemory(size_t size);
+
+  // WebKit::WebDiscardableMemory:
   virtual bool lock();
   virtual void unlock();
   virtual void* data();
 
-  // Initialize the WebDiscardableMemoryImpl object and lock the memory.
-  // Returns true on success. No memory is allocated if this call returns
-  // false. This call should only be called once.
-  bool InitializeAndLock(size_t size);
-
  private:
+  WebDiscardableMemoryImpl(scoped_ptr<base::DiscardableMemory> memory);
+
   scoped_ptr<base::DiscardableMemory> discardable_;
+
   DISALLOW_COPY_AND_ASSIGN(WebDiscardableMemoryImpl);
 };