Revert 87415 - Convert more interfaces to the new thunk system. This goes up to and including

ppapi/proxy/ppb_font_proxy.cc

 // 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 "ppapi/proxy/ppb_font_proxy.h"
 
 #include "base/bind.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 46 matching lines @@
   static const Info info = {
     ::ppapi::thunk::GetPPB_Font_Thunk(),
     PPB_FONT_DEV_INTERFACE,
     INTERFACE_ID_PPB_FONT,
     false,
     &CreateFontProxy,
   };
   return &info;
 }
 
-::ppapi::thunk::PPB_Font_FunctionAPI* PPB_Font_Proxy::AsPPB_Font_FunctionAPI() {
+::ppapi::thunk::PPB_Font_FunctionAPI* PPB_Font_Proxy::AsFont_FunctionAPI() {
   return this;
 }
 
 PP_Var PPB_Font_Proxy::GetFontFamilies(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_MakeUndefined();
 
   // Assume the font families don't change, so we can cache the result globally.
   static std::string families;
@@ skipping 29 matching lines @@
                                &webkit_event_, desc,
                                face ? *face : std::string(),
                                GetDispatcher()->preferences(),
                                &result));
   font_forwarding_.reset(result);
 }
 
 Font::~Font() {
 }
 
-ppapi::thunk::PPB_Font_API* Font::AsPPB_Font_API() {
+ppapi::thunk::PPB_Font_API* Font::AsFont_API() {
   return this;
 }
 
 Font* Font::AsFont() {
   return this;
 }
 
 PP_Bool Font::Describe(PP_FontDescription_Dev* description,
                        PP_FontMetrics_Dev* metrics) {
   std::string face;
@@ skipping 92 matching lines @@
   return result;
 }
 
 void Font::RunOnWebKitThread(const base::Closure& task) {
   GetDispatcher()->PostToWebKitThread(FROM_HERE, task);
   webkit_event_.Wait();
 }
 
 }  // namespace proxy
 }  // namespace pp