Revert "Revert 285479 "Make DataSource::Stop() synchronous.""

media/base/data_source.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_DATA_SOURCE_H_
 #define MEDIA_BASE_DATA_SOURCE_H_
 
 #include "base/callback.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
@@ skipping 10 matching lines @@
   virtual ~DataSource();
 
   // Reads |size| bytes from |position| into |data|. And when the read is done
   // or failed, |read_cb| is called with the number of bytes read or
   // kReadError in case of error.
   virtual void Read(int64 position, int size, uint8* data,
                     const DataSource::ReadCB& read_cb) = 0;
 
   // Stops the DataSource. Once this is called all future Read() calls will
   // return an error.
-  virtual void Stop(const base::Closure& callback) = 0;
+  virtual void Stop() = 0;
 
   // Returns true and the file size, false if the file size could not be
   // retrieved.
   virtual bool GetSize(int64* size_out) = 0;
 
   // Returns true if we are performing streaming. In this case seeking is
   // not possible.
   virtual bool IsStreaming() = 0;
 
   // Notify the DataSource of the bitrate of the media.
   // Values of |bitrate| <= 0 are invalid and should be ignored.
   virtual void SetBitrate(int bitrate) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DataSource);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DATA_SOURCE_H_