Add a GUID to base::SharedMemoryHandle.

ppapi/proxy/nacl_message_scanner.cc

 // Copyright 2013 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/nacl_message_scanner.h"
 
 #include <stddef.h>
 
 #include <tuple>
 #include <utility>
@@ skipping 41 matching lines @@
   // Callback to receive the nested message in a resource message or reply.
   base::Callback<void(PP_Resource, const IPC::Message&, SerializedHandle*)>
       nested_msg_callback;
 };
 
 void WriteHandle(int handle_index,
                  const SerializedHandle& handle,
                  base::Pickle* msg) {
   SerializedHandle::WriteHeader(handle.header(), msg);
 
-  if (handle.type() != SerializedHandle::INVALID) {
+  if (handle.type() == SerializedHandle::SHARED_MEMORY) {
     // Now write the handle itself in POSIX style.
-    // See ParamTraits<FileDescriptor>::Read for where these values are read.
+    // This serialization must be kept in sync with
+    // ParamTraits<SharedMemoryHandle>::Write and
+    // ParamTraits<UnguessableToken>::Write.
+    if (handle.shmem().IsValid()) {
+      msg->WriteBool(true);  // valid == true
+      msg->WriteInt(handle_index);
+      msg->WriteUInt64(handle.shmem().GetGUID().GetHighForSerialization());
+      msg->WriteUInt64(handle.shmem().GetGUID().GetLowForSerialization());
+    } else {
+      msg->WriteBool(false);  // valid == false
+    }
+  } else if (handle.type() != SerializedHandle::INVALID) {
+    // Now write the handle itself in POSIX style.
+    // This serialization must be kept in sync with
+    // ParamTraits<FileDescriptor>::Write.
     msg->WriteBool(true);  // valid == true
     msg->WriteInt(handle_index);
   }
 }
 
 // Define overloads for each kind of message parameter that requires special
 // handling. See ScanTuple for how these get used.
 
 // Overload to match SerializedHandle.
 void ScanParam(const SerializedHandle& handle, ScanningResults* results) {
@@ skipping 483 matching lines @@
             fio_it->second->SetMaxWrittenOffset(offset_it->second);
         }
       }
       break;
     }
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi