Removed MemAlloc and MemFree from PPB_Core

BUG=81610
TEST=Trybots

Review URL: http://codereview.chromium.org/7349016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92554 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 14 insertions, 6 deletions

diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 8a01f63..7af6f17 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -176,8 +176,6 @@ PP_Bool IsMainThread() {
 const PPB_Core core_interface = {
   &AddRefResource,
   &ReleaseResource,
-  &MemAlloc,
-  &MemFree,
   &GetTime,
   &GetTickTime,
   &CallOnMainThread,
@@ -549,6 +547,11 @@ const PPB_Core* PluginModule::GetCore() {
 }
 
 // static
+const PPB_Memory_Dev* PluginModule::GetMemoryDev() {
+  return static_cast<const PPB_Memory_Dev*>(PPB_Memory_Impl::GetInterface());
+}
+
+// static
 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
   return &GetInterface;
 }
diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h
index 52865bfc..2a9c341 100644
--- a/webkit/plugins/ppapi/plugin_module.h
+++ b/webkit/plugins/ppapi/plugin_module.h
@@ -25,6 +25,7 @@
 class FilePath;
 class MessageLoop;
 struct PPB_Core;
+struct PPB_Memory_Dev;
 typedef void* NPIdentifier;
 
 namespace base {
@@ -100,6 +101,8 @@ class PluginModule : public base::RefCounted<PluginModule>,
 
   static const PPB_Core* GetCore();
 
+  static const PPB_Memory_Dev* GetMemoryDev();
+
   // Returns a pointer to the local GetInterface function for retrieving
   // PPB interfaces.
   static GetInterfaceFunc GetLocalGetInterfaceFunc();
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index c7df634..72bece9 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -11,6 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
+#include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
@@ -827,7 +828,7 @@ bool PluginInstance::GetPreferredPrintOutputFormat(
         *format = PP_PRINTOUTPUTFORMAT_RASTER_0_4;
       }
     }
-    PluginModule::GetCore()->MemFree(supported_formats);
+    PluginModule::GetMemoryDev()->MemFree(supported_formats);
     return found_supported_format;
   }
   return false;
diff --git a/webkit/plugins/ppapi/ppb_char_set_impl.cc b/webkit/plugins/ppapi/ppb_char_set_impl.cc
index 47197fe..28d9101 100644
--- a/webkit/plugins/ppapi/ppb_char_set_impl.cc
+++ b/webkit/plugins/ppapi/ppb_char_set_impl.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_char_set_impl.h"
 
 #include "ppapi/c/dev/ppb_char_set_dev.h"
+#include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/shared_impl/char_set_impl.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
@@ -35,7 +36,7 @@ char* PPB_CharSet_Impl::UTF16ToCharSet(PP_Instance instance,
                                        PP_CharSet_ConversionError on_error,
                                        uint32_t* output_length) {
   return ::ppapi::CharSetImpl::UTF16ToCharSet(
-      PluginModule::GetCore(), utf16, utf16_len, output_char_set, on_error,
+      PluginModule::GetMemoryDev(), utf16, utf16_len, output_char_set, on_error,
       output_length);
 }
 
@@ -46,7 +47,7 @@ uint16_t* PPB_CharSet_Impl::CharSetToUTF16(PP_Instance instance,
                                            PP_CharSet_ConversionError on_error,
                                            uint32_t* output_length) {
   return ::ppapi::CharSetImpl::CharSetToUTF16(
-      PluginModule::GetCore(), input, input_len, input_char_set, on_error,
+      PluginModule::GetMemoryDev(), input, input_len, input_char_set, on_error,
       output_length);
 }