diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 00:41:58 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 00:41:58 +0000 |
| commit | 04671d7392ef0e1b86c76cd9c81803e87c639ca8 (patch) | |
| tree | a0904a0b0db9c76877cc2c3891178d7d78204e61 /chrome/utility | |
| parent | 5dde2cd324cc57769bfed38eb95fc5267a8a8a16 (diff) | |
| download | chromium_src-04671d7392ef0e1b86c76cd9c81803e87c639ca8.zip chromium_src-04671d7392ef0e1b86c76cd9c81803e87c639ca8.tar.gz chromium_src-04671d7392ef0e1b86c76cd9c81803e87c639ca8.tar.bz2 | |
Revert "Revert 285479 "Make DataSource::Stop() synchronous.""
This reverts commit aca48d3efdf5ba8a891d6f139fd8ba8db8d69fc2.
The original CL didn't cause issue 397656. It's caused by previous CLs and is
fixed by r286787. This CL simply reland the original CL.
TBR=gbillock@chromium.org
BUG=349211, 397656
TEST=Existing tests pass.
Review URL: https://codereview.chromium.org/435023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/media_galleries/ipc_data_source.cc | 3 | ||||
| -rw-r--r-- | chrome/utility/media_galleries/ipc_data_source.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/utility/media_galleries/ipc_data_source.cc b/chrome/utility/media_galleries/ipc_data_source.cc index c44670a..c65a898 100644 --- a/chrome/utility/media_galleries/ipc_data_source.cc +++ b/chrome/utility/media_galleries/ipc_data_source.cc @@ -21,9 +21,8 @@ IPCDataSource::~IPCDataSource() { DCHECK(utility_thread_checker_.CalledOnValidThread()); } -void IPCDataSource::Stop(const base::Closure& callback) { +void IPCDataSource::Stop() { DCHECK(data_source_thread_checker_.CalledOnValidThread()); - callback.Run(); } void IPCDataSource::Read(int64 position, int size, uint8* data, diff --git a/chrome/utility/media_galleries/ipc_data_source.h b/chrome/utility/media_galleries/ipc_data_source.h index c65c457..6fb3b76 100644 --- a/chrome/utility/media_galleries/ipc_data_source.h +++ b/chrome/utility/media_galleries/ipc_data_source.h @@ -32,7 +32,7 @@ class IPCDataSource: public media::DataSource, // Implementation of DataSource. These methods may be called on any single // thread. First usage of these methods attaches a thread checker. - virtual void Stop(const base::Closure& callback) OVERRIDE; + virtual void Stop() OVERRIDE; virtual void Read(int64 position, int size, uint8* data, const ReadCB& read_cb) OVERRIDE; virtual bool GetSize(int64* size_out) OVERRIDE; |