base: Discardable memory types.

skia/ext/SkDiscardableMemory_chrome.cc

Index: skia/ext/SkDiscardableMemory_chrome.cc
diff --git a/skia/ext/SkDiscardableMemory_chrome.cc b/skia/ext/SkDiscardableMemory_chrome.cc
index 886c9950b81b2d48b3a761f1fb2f9a99febd5be1..2169ab88ebf155196b1adfa6cdafbd5335e7c154 100644
--- a/skia/ext/SkDiscardableMemory_chrome.cc
+++ b/skia/ext/SkDiscardableMemory_chrome.cc
@@ -7,11 +7,11 @@
 SkDiscardableMemoryChrome::~SkDiscardableMemoryChrome() {}
 
 bool SkDiscardableMemoryChrome::lock() {
-  const base::LockDiscardableMemoryStatus status = discardable_->Lock();
+  const base::DiscardableMemoryLockStatus status = discardable_->Lock();
   switch (status) {
-    case base::DISCARDABLE_MEMORY_SUCCESS:
+    case base::DISCARDABLE_MEMORY_LOCK_STATUS_SUCCESS:
       return true;
-    case base::DISCARDABLE_MEMORY_PURGED:
+    case base::DISCARDABLE_MEMORY_LOCK_STATUS_PURGED:
       discardable_->Unlock();
       return false;
     default:
@@ -35,7 +35,8 @@ SkDiscardableMemoryChrome::SkDiscardableMemoryChrome(
 
 SkDiscardableMemory* SkDiscardableMemory::Create(size_t bytes) {
   scoped_ptr<base::DiscardableMemory> discardable(
-      base::DiscardableMemory::CreateLockedMemory(bytes));
+      base::DiscardableMemory::CreateLockedMemory(
+          base::DiscardableMemory::GetDefaultType(), bytes));
   if (!discardable)
     return NULL;
   return new SkDiscardableMemoryChrome(discardable.Pass());