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

ppapi/proxy/serialized_structs.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/serialized_structs.h"
 
 #include "base/pickle.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_rect.h"
@@ skipping 84 matching lines @@
 
 SerializedHandle::SerializedHandle(const base::SharedMemoryHandle& handle,
                                    uint32_t size)
     : type_(SHARED_MEMORY),
       shm_handle_(handle),
       size_(size),
       descriptor_(IPC::InvalidPlatformFileForTransit()) {
 }
 
 SerializedHandle::SerializedHandle(
+    Type type,
     const IPC::PlatformFileForTransit& socket_descriptor)
-    : type_(SOCKET),
+    : type_(type),
       shm_handle_(base::SharedMemory::NULLHandle()),
       size_(0),
       descriptor_(socket_descriptor) {
 }
 
 bool SerializedHandle::IsHandleValid() const {
   if (type_ == SHARED_MEMORY)
     return base::SharedMemory::IsHandleValid(shm_handle_);
-  else if (type_ == SOCKET)
-    return (IPC::InvalidPlatformFileForTransit() == descriptor_);
+  else if (type_ == SOCKET || type_ == CHANNEL_HANDLE)
+    return !(IPC::InvalidPlatformFileForTransit() == descriptor_);
   return false;
 }
 
 // static
 bool SerializedHandle::WriteHeader(const Header& hdr, Pickle* pickle) {
   if (!pickle->WriteInt(hdr.type))
     return false;
   if (hdr.type == SHARED_MEMORY) {
     if (!pickle->WriteUInt32(hdr.size))
       return false;
@@ skipping 11 matching lines @@
   switch (type) {
     case SHARED_MEMORY: {
       uint32_t size = 0;
       if (!iter->ReadUInt32(&size))
         return false;
       hdr->size = size;
       valid_type = true;
       break;
     }
     case SOCKET:
-      valid_type = true;
-      break;
+    case CHANNEL_HANDLE:
     case INVALID:
       valid_type = true;
       break;
     // No default so the compiler will warn us if a new type is added.
   }
   if (valid_type)
     hdr->type = Type(type);
   return valid_type;
 }
 
 }  // namespace proxy
 }  // namespace ppapi