PAPI: Fix bug in RunWhileLocked, add support for params

ppapi/shared_impl/ppb_audio_shared.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/shared_impl/ppb_audio_shared.h"
 
 #include "base/logging.h"
 #include "media/audio/shared_memory_util.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
+#include "ppapi/shared_impl/proxy_lock.h"
 
 // Hard coded values from PepperPlatformAudioOutputImpl.
 // TODO(dalecurtis): PPAPI shouldn't hard code these values for all clients.
 enum { kChannels = 2, kBytesPerSample = 2 };
 
 namespace ppapi {
 
 #if defined(OS_NACL)
 namespace {
 // Because this is static, the function pointers will be NULL initially.
@@ skipping 101 matching lines @@
 
   int result = thread_functions.thread_create(&thread_id_, CallRun, this);
   DCHECK_EQ(result, 0);
   thread_active_ = true;
 #endif
 }
 
 void PPB_Audio_Shared::StopThread() {
 #if !defined(OS_NACL)
   if (audio_thread_.get()) {
-    audio_thread_->Join();
+    // In general, the audio thread should not do Pepper calls, but it might
+    // anyway (for example, our Audio test does CallOnMainThread). If it did
+    // a pepper call which acquires the lock (most of them do), and we try to
+    // shut down the thread and Join it while holding the lock, we would
+    // deadlock. So we give up the lock here so that the thread at least _can_
+    // make Pepper calls without causing deadlock.
+    CallWhileUnlocked(base::Bind(&base::DelegateSimpleThread::Join,
+                                 base::Unretained(audio_thread_.get())));
     audio_thread_.reset();
   }
 #else
   if (thread_active_) {
-    int result = thread_functions.thread_join(thread_id_);
+    // See comment above about why we unlock here.
+    int result = CallWhileUnlocked(thread_functions.thread_join, thread_id_);
     DCHECK_EQ(0, result);
     thread_active_ = false;
   }
 #endif
 }
 
 #if defined(OS_NACL)
 // static
 void PPB_Audio_Shared::SetThreadFunctions(
     const struct PP_ThreadFunctions* functions) {
@@ skipping 28 matching lines @@
     // padding for alignment, there may be more data available than this.  We're
     // relying on AudioSyncReader::Read() to parse this with that in mind.
     // Rename these methods to Set/GetActualFrameCount().
     media::SetActualDataSizeInBytes(
         shared_memory_.get(), shared_memory_size_,
         audio_bus_->frames() * bytes_per_frame);
   }
 }
 
 }  // namespace ppapi