Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

ppapi/proxy/ppb_flash_proxy.cc

 // Copyright (c) 2010 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_flash_proxy.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ppapi/c/dev/pp_file_info_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
-#include "webkit/glue/plugins/ppb_private2.h"
+#include "webkit/plugins/ppapi/ppb_flash.h"
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 // Given an error code and a handle result from a Pepper API call, converts
 // to a PlatformFileForTransit, possibly also updating the error value if
 // an error occurred.
 IPC::PlatformFileForTransit PlatformFileToPlatformFileForTransit(
@@ skipping 156 matching lines @@
 bool NavigateToURL(PP_Instance pp_instance,
                    const char* url,
                    const char* target) {
   bool result = false;
   PluginDispatcher::Get()->Send(
       new PpapiHostMsg_PPBFlash_NavigateToURL(
           INTERFACE_ID_PPB_FLASH, pp_instance, url, target, &result));
   return result;
 }
 
-const PPB_Private2 ppb_flash = {
+const PPB_Flash ppb_flash = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
   &OpenModuleLocalFile,
   &RenameModuleLocalFile,
   &DeleteModuleLocalFileOrDir,
   &CreateModuleLocalDir,
   &QueryModuleLocalFile,
   &GetModuleLocalDirContents,
   &FreeModuleLocalDirContents,
@@ skipping 144 matching lines @@
 void PPB_Flash_Proxy::OnMsgNavigateToURL(PP_Instance instance,
                                          const std::string& url,
                                          const std::string& target,
                                          bool* result) {
   *result = ppb_flash_target()->NavigateToURL(instance, url.c_str(),
                                               target.c_str());
 }
 
 }  // namespace proxy
 }  // namespace pp