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

trunk/src/chrome/browser/chromeos/file_system_provider/request_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_REQUEST_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_REQUEST_MANAGER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 41 matching lines @@
     // Success callback invoked by the providing extension in response to
     // Execute(). It may be called more than once, until |has_more| is set to
     // false.
     virtual void OnSuccess(int request_id,
                            scoped_ptr<RequestValue> result,
                            bool has_more) = 0;
 
     // Error callback invoked by the providing extension in response to
     // Execute(). It can be called at most once. It can be also called if the
     // request is aborted due to a timeout.
-    virtual void OnError(int request_id,
-                         scoped_ptr<RequestValue> result,
-                         base::File::Error error) = 0;
+    virtual void OnError(int request_id, base::File::Error error) = 0;
   };
 
   // Observes activities in the request manager.
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called when the request is created.
     virtual void OnRequestCreated(int request_id, RequestType type) = 0;
 
@@ skipping 23 matching lines @@
 
   // Handles successful response for the |request_id|. If |has_more| is false,
   // then the request is disposed, after handling the |response|. On error,
   // returns false, and the request is disposed.
   bool FulfillRequest(int request_id,
                       scoped_ptr<RequestValue> response,
                       bool has_more);
 
   // Handles error response for the |request_id|. If handling the error fails,
   // returns false. Always disposes the request.
-  bool RejectRequest(int request_id,
-                     scoped_ptr<RequestValue> response,
-                     base::File::Error error);
+  bool RejectRequest(int request_id, base::File::Error error);
 
   // Sets a custom timeout for tests. The new timeout value will be applied to
   // new requests
   void SetTimeoutForTesting(const base::TimeDelta& timeout);
 
   // Gets number of active requests for logging purposes.
   // TODO(mtomasz): Introduce a logger class to gather more information
   size_t GetActiveRequestsForLogging() const;
 
   // Adds and removes observers.
@@ skipping 29 matching lines @@
   base::WeakPtrFactory<RequestManager> weak_ptr_factory_;
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestManager);
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_REQUEST_MANAGER_H_