Revert 171389

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 "base/platform_file.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
@@ skipping 89 matching lines @@
 SerializedHandle::SerializedHandle(
     Type type,
     const IPC::PlatformFileForTransit& socket_descriptor)
     : 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 || type_ == CHANNEL_HANDLE)
-    return !(IPC::InvalidPlatformFileForTransit() == descriptor_);
+  switch (type_) {
+    case SHARED_MEMORY:
+      return base::SharedMemory::IsHandleValid(shm_handle_);
+    case SOCKET:
+    case CHANNEL_HANDLE:
+    case FILE:
+      return !(IPC::InvalidPlatformFileForTransit() == descriptor_);
+    case INVALID:
+      return false;
+    // No default so the compiler will warn us if a new type is added.
+  }
   return false;
 }
 
 void SerializedHandle::Close() {
   if (IsHandleValid()) {
     switch (type_) {
       case INVALID:
         NOTREACHED();
         break;
       case SHARED_MEMORY:
         base::SharedMemory::CloseHandle(shm_handle_);
         break;
       case SOCKET:
       case CHANNEL_HANDLE:
+      case FILE:
         base::PlatformFile file =
             IPC::PlatformFileForTransitToPlatformFile(descriptor_);
 #if !defined(OS_NACL)
         base::ClosePlatformFile(file);
 #else
         close(file);
 #endif
         break;
       // No default so the compiler will warn us if a new type is added.
     }
@@ skipping 23 matching lines @@
     case SHARED_MEMORY: {
       uint32_t size = 0;
       if (!iter->ReadUInt32(&size))
         return false;
       hdr->size = size;
       valid_type = true;
       break;
     }
     case SOCKET:
     case CHANNEL_HANDLE:
+    case FILE:
     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