Change NaCl IPC PPAPI proxy startup to support a NaCl-Browser process

ppapi/proxy/ppapi_param_traits.cc

 // Copyright (c) 2012 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"
@@ skipping 305 matching lines @@
 
 // static
 void ParamTraits<ppapi::proxy::SerializedHandle>::Write(Message* m,
                                                         const param_type& p) {
   ppapi::proxy::SerializedHandle::WriteHeader(p.header(), m);
   switch (p.type()) {
     case ppapi::proxy::SerializedHandle::SHARED_MEMORY:
       ParamTraits<base::SharedMemoryHandle>::Write(m, p.shmem());
       break;
     case ppapi::proxy::SerializedHandle::SOCKET:
+    case ppapi::proxy::SerializedHandle::CHANNEL_HANDLE:
       ParamTraits<IPC::PlatformFileForTransit>::Write(m, p.descriptor());
       break;
     case ppapi::proxy::SerializedHandle::INVALID:
       break;
     // No default so the compiler will warn on new types.
   }
 }
 
 // static
 bool ParamTraits<ppapi::proxy::SerializedHandle>::Read(const Message* m,
@@ skipping 12 matching lines @@
       break;
     }
     case ppapi::proxy::SerializedHandle::SOCKET: {
       IPC::PlatformFileForTransit socket;
       if (ParamTraits<IPC::PlatformFileForTransit>::Read(m, iter, &socket)) {
         r->set_socket(socket);
         return true;
       }
       break;
     }
+    case ppapi::proxy::SerializedHandle::CHANNEL_HANDLE: {
+      IPC::PlatformFileForTransit desc;
+      if (ParamTraits<IPC::PlatformFileForTransit>::Read(m, iter, &desc)) {
+        r->set_channel_handle(desc);
+        return true;
+      }
+      break;
+    }
     case ppapi::proxy::SerializedHandle::INVALID:
       return true;
     // No default so the compiler will warn us if a new type is added.
   }
   return false;
 }
 
 // static
 void ParamTraits<ppapi::proxy::SerializedHandle>::Log(const param_type& p,
                                                       std::string* l) {
@@ skipping 190 matching lines @@
   return ParamTraits<ListValue>::Read(m, iter, &(r->values_));
 }
 
 // static
 void ParamTraits<ppapi::PPB_X509Certificate_Fields>::Log(const param_type& p,
                                                          std::string* l) {
 }
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)
 
 }  // namespace IPC