Make Demuxer::Stop() synchronous.

media/base/demuxer.h

 // 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.
 
 #ifndef MEDIA_BASE_DEMUXER_H_
 #define MEDIA_BASE_DEMUXER_H_
 
 #include <vector>
 
 #include "base/time/time.h"
@@ skipping 54 matching lines @@
   // lifetime of the demuxer. Don't delete it!
   virtual void Initialize(DemuxerHost* host,
                           const PipelineStatusCB& status_cb,
                           bool enable_text_tracks) = 0;
 
   // Carry out any actions required to seek to the given time, executing the
   // callback upon completion.
   virtual void Seek(base::TimeDelta time,
                     const PipelineStatusCB& status_cb) = 0;
 
-  // Starts stopping this demuxer, executing the callback upon completion.
+  // Stops this demuxer.
   //
-  // After the callback completes the demuxer may be destroyed. It is illegal to
-  // call any method (including Stop()) after a demuxer has stopped.
-  virtual void Stop(const base::Closure& callback) = 0;
+  // After this call the demuxer may be destroyed. It is illegal to call any
+  // method (including Stop()) after a demuxer has stopped.
+  virtual void Stop() = 0;
 
   // Returns the first stream of the given stream type (which is not allowed
   // to be DemuxerStream::TEXT), or NULL if that type of stream is not present.
   virtual DemuxerStream* GetStream(DemuxerStream::Type type) = 0;
 
   // Returns Time represented by presentation timestamp 0.
   // If the timstamps are not associated with a Time, then
   // a null Time is returned.
   virtual base::Time GetTimelineOffset() const = 0;
 
   // Returns liveness of the stream, i.e. whether it is recorded or live.
   virtual Liveness GetLiveness() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Demuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DEMUXER_H_