Revert 277929 "[fsp] Cleanup handling errors for operation reque..."

trunk/src/chrome/browser/chromeos/file_system_provider/request_manager.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/browser/chromeos/file_system_provider/request_manager.h"
 
 #include "base/files/file.h"
 #include "base/stl_util.h"
 
 namespace chromeos {
@@ skipping 31 matching lines @@
     : next_id_(1),
       timeout_(base::TimeDelta::FromSeconds(kDefaultTimeout)),
       weak_ptr_factory_(this) {}
 
 RequestManager::~RequestManager() {
   // Abort all of the active requests.
   RequestMap::iterator it = requests_.begin();
   while (it != requests_.end()) {
     const int request_id = it->first;
     ++it;
-    RejectRequest(request_id,
-                  scoped_ptr<RequestValue>(new RequestValue()),
-                  base::File::FILE_ERROR_ABORT);
+    RejectRequest(request_id, base::File::FILE_ERROR_ABORT);
   }
 
   DCHECK_EQ(0u, requests_.size());
   STLDeleteValues(&requests_);
 }
 
 int RequestManager::CreateRequest(RequestType type,
                                   scoped_ptr<HandlerInterface> handler) {
   // The request id is unique per request manager, so per service, thereof
   // per profile.
@@ skipping 41 matching lines @@
       Observer, observers_, OnRequestFulfilled(request_id, has_more));
 
   if (!has_more)
     DestroyRequest(request_id);
   else
     request_it->second->timeout_timer.Reset();
 
   return true;
 }
 
-bool RequestManager::RejectRequest(int request_id,
-                                   scoped_ptr<RequestValue> response,
-                                   base::File::Error error) {
+bool RequestManager::RejectRequest(int request_id, base::File::Error error) {
   RequestMap::iterator request_it = requests_.find(request_id);
   if (request_it == requests_.end())
     return false;
 
-  request_it->second->handler->OnError(request_id, response.Pass(), error);
+  request_it->second->handler->OnError(request_id, error);
+
   FOR_EACH_OBSERVER(Observer, observers_, OnRequestRejected(request_id, error));
+
   DestroyRequest(request_id);
 
   return true;
 }
 
 void RequestManager::SetTimeoutForTesting(const base::TimeDelta& timeout) {
   timeout_ = timeout;
 }
 
 size_t RequestManager::GetActiveRequestsForLogging() const {
@@ skipping 10 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 RequestManager::Request::Request() {}
 
 RequestManager::Request::~Request() {}
 
 void RequestManager::OnRequestTimeout(int request_id) {
   FOR_EACH_OBSERVER(Observer, observers_, OnRequestTimeouted(request_id));
 
-  RejectRequest(request_id,
-                scoped_ptr<RequestValue>(new RequestValue()),
-                base::File::FILE_ERROR_ABORT);
+  RejectRequest(request_id, base::File::FILE_ERROR_ABORT);
 }
 
 void RequestManager::DestroyRequest(int request_id) {
   RequestMap::iterator request_it = requests_.find(request_id);
   if (request_it == requests_.end())
     return;
 
   delete request_it->second;
   requests_.erase(request_it);
 
   FOR_EACH_OBSERVER(Observer, observers_, OnRequestDestroyed(request_id));
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos