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

ppapi/proxy/dispatcher.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/dispatcher.h"
 
 #include <string.h>  // For memset.
 
 #include <map>
 
@@ skipping 37 matching lines @@
 #include "ppapi/proxy/ppb_instance_proxy.h"
 #include "ppapi/proxy/ppb_pdf_proxy.h"
 #include "ppapi/proxy/ppb_testing_proxy.h"
 #include "ppapi/proxy/ppb_url_loader_proxy.h"
 #include "ppapi/proxy/ppb_url_request_info_proxy.h"
 #include "ppapi/proxy/ppb_url_response_info_proxy.h"
 #include "ppapi/proxy/ppb_var_deprecated_proxy.h"
 #include "ppapi/proxy/ppp_class_proxy.h"
 #include "ppapi/proxy/ppp_instance_proxy.h"
 #include "ppapi/proxy/var_serialization_rules.h"
-#include "webkit/glue/plugins/ppb_private.h"
-#include "webkit/glue/plugins/ppb_private2.h"
+#include "webkit/plugins/ppapi/ppb_pdf.h"
+#include "webkit/plugins/ppapi/ppb_flash.h"
 
 namespace pp {
 namespace proxy {
 
 Dispatcher::Dispatcher(base::ProcessHandle remote_process_handle,
                        GetInterfaceFunc local_get_interface)
     : pp_module_(0),
       remote_process_handle_(remote_process_handle),
       disallow_trusted_interfaces_(false),  // TODO(brettw) make this settable.
       local_get_interface_(local_get_interface),
@@ skipping 185 matching lines @@
     return new PPB_URLRequestInfo_Proxy(this, interface_functions);
   if (interface_name == PPB_URLRESPONSEINFO_INTERFACE)
     return new PPB_URLResponseInfo_Proxy(this, interface_functions);
   if (interface_name == PPB_VAR_DEPRECATED_INTERFACE)
     return new PPB_Var_Deprecated_Proxy(this, interface_functions);
   if (interface_name == PPP_INSTANCE_INTERFACE)
     return new PPP_Instance_Proxy(this, interface_functions);
 
   // Trusted interfaces.
   if (!disallow_trusted_interfaces_) {
-    if (interface_name == PPB_PRIVATE2_INTERFACE)
+    if (interface_name == PPB_FLASH_INTERFACE)
       return new PPB_Flash_Proxy(this, interface_functions);
-    if (interface_name == PPB_PRIVATE_INTERFACE)
-      return new PPB_Pdf_Proxy(this, interface_functions);
+    if (interface_name == PPB_PDF_INTERFACE)
+      return new PPB_PDF_Proxy(this, interface_functions);
     if (interface_name == PPB_URLLOADERTRUSTED_INTERFACE)
       return new PPB_URLLoaderTrusted_Proxy(this, interface_functions);
   }
 
   return NULL;
 }
 
 }  // namespace proxy
 }  // namespace pp