Remove 'Flash' from TCP/UDP Pepper interfaces.

ppapi/proxy/ppapi_param_traits.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/ppapi_param_traits.h"
 
 #include <string.h>  // For memcpy
 
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
-#include "ppapi/c/private/ppb_flash_tcp_socket.h"
+#include "ppapi/c/private/ppb_tcp_socket.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/proxy/serialized_flash_menu.h"
 #include "ppapi/shared_impl/host_resource.h"
 
 namespace IPC {
 
 namespace {
 
 // Deserializes a vector from IPC. This special version must be used instead
@@ skipping 107 matching lines @@
       system_type != PP_FILESYSTEMTYPE_LOCALTEMPORARY)
     return false;
   r->system_type = static_cast<PP_FileSystemType>(system_type);
   return true;
 }
 
 // static
 void ParamTraits<PP_FileInfo>::Log(const param_type& p, std::string* l) {
 }
 
-// PP_Flash_NetAddress ---------------------------------------------------------
+// PP_NetAddress ---------------------------------------------------------
 
 // static
-void ParamTraits<PP_Flash_NetAddress>::Write(Message* m, const param_type& p) {
+void ParamTraits<PP_NetAddress>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.size);
   m->WriteBytes(p.data, static_cast<int>(p.size));
 }
 
 // static
-bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
-                                            void** iter,
-                                            param_type* p) {
+bool ParamTraits<PP_NetAddress>::Read(const Message* m,
+                                      void** iter,
+                                      param_type* p) {
   uint16 size;
   if (!ReadParam(m, iter, &size))
     return false;
   if (size > sizeof(p->data))
     return false;
   p->size = size;
 
   const char* data;
   if (!m->ReadBytes(iter, &data, size))
     return false;
   memcpy(p->data, data, size);
   return true;
 }
 
 // static
+void ParamTraits<PP_NetAddress>::Log(const param_type& p,
+                                     std::string* l) {
+  l->append("<PP_NetAddress (");
+  LogParam(p.size, l);
+  l->append(" bytes)>");
+}
+
+// PP_Flash_NetAddress ---------------------------------------------------------
+
+// static
+void ParamTraits<PP_Flash_NetAddress>::Write(Message* m, const param_type& p) {
+  ParamTraits<PP_NetAddress>::Write(m,
+      reinterpret_cast<const ParamTraits<PP_NetAddress>::param_type&>(p));
+}
+
+// static
+bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
+                                            void** iter,
+                                            param_type* p) {
+  return ParamTraits<PP_NetAddress>::Read(m, iter,
+      reinterpret_cast<ParamTraits<PP_NetAddress>::param_type*>(p));
+}
+
+// static
 void ParamTraits<PP_Flash_NetAddress>::Log(const param_type& p,
                                            std::string* l) {
-  l->append("<PP_Flash_NetAddress (");
-  LogParam(p.size, l);
-  l->append(" bytes)>");
+  ParamTraits<PP_NetAddress>::Log(
+      reinterpret_cast<const ParamTraits<PP_NetAddress>::param_type&>(p), l);
 }
 
 // PP_ObjectProperty -----------------------------------------------------------
 
 // static
 void ParamTraits<PP_ObjectProperty>::Write(Message* m, const param_type& p) {
   // FIXME(brettw);
 }
 
 // static
@@ skipping 293 matching lines @@
                                                           param_type* r) {
   return r->ReadFromMessage(m, iter);
 }
 
 // static
 void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Log(const param_type& p,
                                                          std::string* l) {
 }
 
 }  // namespace IPC