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

chrome/utility/media_galleries/ipc_data_source.cc

 // Copyright 2014 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.
 
 #include "chrome/utility/media_galleries/ipc_data_source.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "content/public/utility/utility_thread.h"
 
 namespace metadata {
 
 IPCDataSource::IPCDataSource(int64 total_size)
     : total_size_(total_size),
       utility_task_runner_(base::MessageLoopProxy::current()),
       next_request_id_(0) {
   data_source_thread_checker_.DetachFromThread();
 }
 
 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,
                          const DataSource::ReadCB& read_cb) {
   DCHECK(data_source_thread_checker_.CalledOnValidThread());
   utility_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IPCDataSource::ReadOnUtilityThread, base::Unretained(this),
                  position, size, data, read_cb));
 }
@@ skipping 62 matching lines @@
   if (it == pending_requests_.end())
     return;
 
   std::copy(bytes.begin(), bytes.end(), it->second.destination);
   it->second.callback.Run(bytes.size());
 
   pending_requests_.erase(it);
 }
 
 }  // namespace metadata