Update pepper to not assume that SharedMemoryHandle is an int.

content/renderer/pepper/audio_helper.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 "content/renderer/pepper/audio_helper.h"
 
 #include "base/logging.h"
 #include "content/common/pepper_file_util.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 10 matching lines @@
 
 int32_t AudioHelper::GetSyncSocketImpl(int* sync_socket) {
   if (socket_for_create_callback_) {
     *sync_socket = IntegerFromSyncSocketHandle(
         socket_for_create_callback_->handle());
     return PP_OK;
   }
   return PP_ERROR_FAILED;
 }
 
-int32_t AudioHelper::GetSharedMemoryImpl(int* shm_handle, uint32_t* shm_size) {
+int32_t AudioHelper::GetSharedMemoryImpl(base::SharedMemory* shm,
+                                         uint32_t* shm_size) {
   if (shared_memory_for_create_callback_) {
-    *shm_handle = reinterpret_cast<int>(PlatformFileFromSharedMemoryHandle(
-        shared_memory_for_create_callback_->handle()));
+    shm = shared_memory_for_create_callback_.get();

[piman, 2015/06/02 00:00:15]

That won't do anything. This only modifies a local variable...

You either need to make shm a base::SharedMemory** and assign *shm, or maybe
have GetSharedMemoryImpl return the SharedMemory*.

[erikchen, 2015/06/02 00:01:47]

Uhh, not sure what portions of my brain failed to function there. Fixing now.

     *shm_size = shared_memory_size_for_create_callback_;
     return PP_OK;
   }
   return PP_ERROR_FAILED;
 }
 
 void AudioHelper::StreamCreated(base::SharedMemoryHandle shared_memory_handle,
                                 size_t shared_memory_size,
                                 base::SyncSocket::Handle socket_handle) {
   if (TrackedCallback::IsPending(create_callback_)) {
@@ skipping 19 matching lines @@
   }
 }
 
 void AudioHelper::SetCreateCallback(
     scoped_refptr<ppapi::TrackedCallback> create_callback) {
   DCHECK(!TrackedCallback::IsPending(create_callback_));
   create_callback_ = create_callback;
 }
 
 }  // namespace content