Don't report errors twice to pipeline clients.

Also convert Pipeline::Stop() to take a Closure instead of a PipelineStatusCB since the status is always OK for a Stop.

Review URL: http://codereview.chromium.org/9863028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129256 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 370575a..a2033f5 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -867,9 +867,10 @@ void WebMediaPlayerImpl::Destroy() {
   // Make sure to kill the pipeline so there's no more media threads running.
   // Note: stopping the pipeline might block for a long time.
   if (started_) {
-    media::PipelineStatusNotification note;
-    pipeline_->Stop(note.Callback());
-    note.Wait();
+    base::WaitableEvent waiter(false, false);
+    pipeline_->Stop(base::Bind(
+        &base::WaitableEvent::Signal, base::Unretained(&waiter)));
+    waiter.Wait();
     started_ = false;
   }