[fsp] Cleanup handling errors for operation requests.

chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc

Index: chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
index 49fcefe36c85ff9dbc5c3068f3abb602ee036217..b4956a90a48579fa1e496b99495a19f87f8da2e3 100644
--- a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
@@ -56,15 +56,19 @@ class EventLogger {
 
   class ErrorEvent {
    public:
-    ErrorEvent(int request_id, base::File::Error error)
-        : request_id_(request_id), error_(error) {}
+    ErrorEvent(int request_id,
+               scoped_ptr<RequestValue> result,
+               base::File::Error error)
+        : request_id_(request_id), result_(result.Pass()), error_(error) {}
     virtual ~ErrorEvent() {}
 
     int request_id() { return request_id_; }
+    RequestValue* result() { return result_.get(); }
     base::File::Error error() { return error_; }
 
    private:
     int request_id_;
+    scoped_ptr<RequestValue> result_;
     base::File::Error error_;
   };
 
@@ -82,8 +86,10 @@ class EventLogger {
         new SuccessEvent(request_id, result.Pass(), has_more));
   }
 
-  void OnError(int request_id, base::File::Error error) {
-    error_events_.push_back(new ErrorEvent(request_id, error));
+  void OnError(int request_id,
+               scoped_ptr<RequestValue> result,
+               base::File::Error error) {
+    error_events_.push_back(new ErrorEvent(request_id, result.Pass(), error));
   }
 
   ScopedVector<ExecuteEvent>& execute_events() { return execute_events_; }
@@ -129,9 +135,11 @@ class FakeHandler : public RequestManager::HandlerInterface {
   }
 
   // RequestManager::Handler overrides.
-  virtual void OnError(int request_id, base::File::Error error) OVERRIDE {
+  virtual void OnError(int request_id,
+                       scoped_ptr<RequestValue> result,
+                       base::File::Error error) OVERRIDE {
     if (logger_.get())
-      logger_->OnError(request_id, error);
+      logger_->OnError(request_id, result.Pass(), error);
   }
 
   virtual ~FakeHandler() {}
@@ -335,8 +343,10 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndFulFill) {
 
   // Rejecting should also fail.
   {
-    bool retry = request_manager_->RejectRequest(request_id,
-                                                 base::File::FILE_ERROR_FAILED);
+    bool retry = request_manager_->RejectRequest(
+        request_id,
+        scoped_ptr<RequestValue>(new RequestValue()),
+        base::File::FILE_ERROR_FAILED);
     EXPECT_FALSE(retry);
     EXPECT_EQ(0u, observer.rejected().size());
   }
@@ -439,7 +449,8 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndReject) {
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
-  bool result = request_manager_->RejectRequest(request_id, error);
+  bool result = request_manager_->RejectRequest(
+      request_id, scoped_ptr<RequestValue>(new RequestValue()), error);
   EXPECT_TRUE(result);
 
   // Validate if the callback has correct arguments.
@@ -465,7 +476,8 @@ TEST_F(FileSystemProviderRequestManagerTest, CreateAndReject) {
 
   // Rejecting should also fail.
   {
-    bool retry = request_manager_->RejectRequest(request_id, error);
+    bool retry = request_manager_->RejectRequest(
+        request_id, scoped_ptr<RequestValue>(new RequestValue()), error);
     EXPECT_FALSE(retry);
     EXPECT_EQ(1u, observer.rejected().size());
   }
@@ -547,7 +559,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
-  bool result = request_manager_->RejectRequest(request_id + 1, error);
+  bool result = request_manager_->RejectRequest(
+      request_id + 1, scoped_ptr<RequestValue>(new RequestValue()), error);
   EXPECT_FALSE(result);
 
   // Callbacks should not be called.
@@ -558,7 +571,8 @@ TEST_F(FileSystemProviderRequestManagerTest,
 
   // Confirm, that the request hasn't been removed, by rejecting it correctly.
   {
-    bool retry = request_manager_->RejectRequest(request_id, error);
+    bool retry = request_manager_->RejectRequest(
+        request_id, scoped_ptr<RequestValue>(new RequestValue()), error);
     EXPECT_TRUE(retry);
     EXPECT_EQ(1u, observer.rejected().size());
   }