From 04671d7392ef0e1b86c76cd9c81803e87c639ca8 Mon Sep 17 00:00:00 2001 From: "xhwang@chromium.org" Date: Sat, 2 Aug 2014 00:41:58 +0000 Subject: 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 --- chrome/utility/media_galleries/ipc_data_source.cc | 3 +-- chrome/utility/media_galleries/ipc_data_source.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'chrome/utility') 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; -- cgit v1.1