[fsp] Pass more detailed errors to the providing extension.

chrome/browser/chromeos/file_system_provider/request_manager_unittest.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 <map>
 #include <string>
 #include <vector>
 
@@ skipping 359 matching lines @@
 
   const std::vector<int> active_request_ids =
       request_manager_->GetActiveRequestIds();
   ASSERT_EQ(1u, active_request_ids.size());
   EXPECT_EQ(request_id, active_request_ids[0]);
 
   scoped_ptr<RequestValue> response(
       RequestValue::CreateForTesting("i-like-vanilla"));
   const bool has_more = false;
 
-  bool result =
+  const base::File::Error result =
       request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
-  EXPECT_TRUE(result);
+  EXPECT_EQ(base::File::FILE_OK, result);
 
   ASSERT_EQ(1u, observer.fulfilled().size());
   EXPECT_EQ(request_id, observer.fulfilled()[0].request_id());
   EXPECT_FALSE(observer.fulfilled()[0].has_more());
 
   // Validate if the callback has correct arguments.
   ASSERT_EQ(1u, logger.success_events().size());
   EXPECT_EQ(0u, logger.error_events().size());
   EventLogger::SuccessEvent* event = logger.success_events()[0];
   ASSERT_TRUE(event->result());
   const std::string* response_test_string = event->result()->testing_params();
   ASSERT_TRUE(response_test_string);
   EXPECT_EQ("i-like-vanilla", *response_test_string);
   EXPECT_FALSE(event->has_more());
 
   // Confirm, that the request is removed. Basically, fulfilling again for the
   // same request, should fail.
   {
     const std::vector<int> active_request_ids =
         request_manager_->GetActiveRequestIds();
     EXPECT_EQ(0u, active_request_ids.size());
 
-    bool retry = request_manager_->FulfillRequest(
+    const base::File::Error retry = request_manager_->FulfillRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue), has_more);
-    EXPECT_FALSE(retry);
+    EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, retry);
     EXPECT_EQ(1u, observer.fulfilled().size());
   }
 
   // Rejecting should also fail.
   {
-    bool retry = request_manager_->RejectRequest(
-        request_id,
-        scoped_ptr<RequestValue>(new RequestValue()),
+    const base::File::Error retry = request_manager_->RejectRequest(
+        request_id, scoped_ptr<RequestValue>(new RequestValue()),
         base::File::FILE_ERROR_FAILED);
-    EXPECT_FALSE(retry);
+    EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, retry);
     EXPECT_EQ(0u, observer.rejected().size());
   }
 
   ASSERT_EQ(1u, observer.destroyed().size());
   EXPECT_EQ(request_id, observer.destroyed()[0].request_id());
   EXPECT_EQ(0u, observer.timeouted().size());
 
   request_manager_->RemoveObserver(&observer);
 }
 
@@ skipping 13 matching lines @@
 
   ASSERT_EQ(1u, observer.created().size());
   EXPECT_EQ(request_id, observer.created()[0].request_id());
   EXPECT_EQ(TESTING, observer.created()[0].type());
 
   ASSERT_EQ(1u, observer.executed().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   const bool has_more = true;
 
-  bool result = request_manager_->FulfillRequest(
+  const base::File::Error result = request_manager_->FulfillRequest(
       request_id, scoped_ptr<RequestValue>(new RequestValue), has_more);
-  EXPECT_TRUE(result);
+  EXPECT_EQ(base::File::FILE_OK, result);
 
   // Validate if the callback has correct arguments.
   ASSERT_EQ(1u, logger.success_events().size());
   EXPECT_EQ(0u, logger.error_events().size());
   EventLogger::SuccessEvent* event = logger.success_events()[0];
   EXPECT_TRUE(event->result());
   EXPECT_TRUE(event->has_more());
 
   ASSERT_EQ(1u, observer.fulfilled().size());
   EXPECT_EQ(request_id, observer.fulfilled()[0].request_id());
   EXPECT_TRUE(observer.fulfilled()[0].has_more());
 
   // Confirm, that the request is not removed (since it has has_more == true).
   // Basically, fulfilling again for the same request, should not fail.
   {
     const std::vector<int> active_request_ids =
         request_manager_->GetActiveRequestIds();
     ASSERT_EQ(1u, active_request_ids.size());
     EXPECT_EQ(request_id, active_request_ids[0]);
 
-    bool new_has_more = false;
-    bool retry = request_manager_->FulfillRequest(
+    const bool new_has_more = false;
+    const base::File::Error retry = request_manager_->FulfillRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue), new_has_more);
-    EXPECT_TRUE(retry);
+    EXPECT_EQ(base::File::FILE_OK, retry);
 
     ASSERT_EQ(2u, observer.fulfilled().size());
     EXPECT_EQ(request_id, observer.fulfilled()[1].request_id());
     EXPECT_FALSE(observer.fulfilled()[1].has_more());
   }
 
   // Since |new_has_more| is false, then the request should be removed. To check
   // it, try to fulfill again, what should fail.
   {
     const std::vector<int> active_request_ids =
         request_manager_->GetActiveRequestIds();
     EXPECT_EQ(0u, active_request_ids.size());
 
-    bool new_has_more = false;
-    bool retry = request_manager_->FulfillRequest(
+    const bool new_has_more = false;
+    const base::File::Error retry = request_manager_->FulfillRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue), new_has_more);
-    EXPECT_FALSE(retry);
+    EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, retry);
     EXPECT_EQ(0u, observer.rejected().size());
   }
 
   ASSERT_EQ(1u, observer.destroyed().size());
   EXPECT_EQ(request_id, observer.destroyed()[0].request_id());
   EXPECT_EQ(0u, observer.timeouted().size());
 
   request_manager_->RemoveObserver(&observer);
 }
 
@@ skipping 11 matching lines @@
   EXPECT_EQ(0u, logger.success_events().size());
   EXPECT_EQ(0u, logger.error_events().size());
 
   ASSERT_EQ(1u, observer.created().size());
   EXPECT_EQ(request_id, observer.created()[0].request_id());
   EXPECT_EQ(TESTING, observer.created()[0].type());
 
   ASSERT_EQ(1u, observer.executed().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
-  base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
-  bool result = request_manager_->RejectRequest(
+  const base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
+  const base::File::Error result = request_manager_->RejectRequest(
       request_id, scoped_ptr<RequestValue>(new RequestValue()), error);
-  EXPECT_TRUE(result);
+  EXPECT_EQ(base::File::FILE_OK, result);
 
   // Validate if the callback has correct arguments.
   ASSERT_EQ(1u, logger.error_events().size());
   EXPECT_EQ(0u, logger.success_events().size());
   EventLogger::ErrorEvent* event = logger.error_events()[0];
   EXPECT_EQ(error, event->error());
 
   ASSERT_EQ(1u, observer.rejected().size());
   EXPECT_EQ(request_id, observer.rejected()[0].request_id());
   EXPECT_EQ(error, observer.rejected()[0].error());
 
   // Confirm, that the request is removed. Basically, fulfilling again for the
   // same request, should fail.
   {
-    bool has_more = false;
-    bool retry = request_manager_->FulfillRequest(
+    const bool has_more = false;
+    const base::File::Error retry = request_manager_->FulfillRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue), has_more);
-    EXPECT_FALSE(retry);
+    EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, retry);
     EXPECT_EQ(0u, observer.fulfilled().size());
   }
 
   // Rejecting should also fail.
   {
-    bool retry = request_manager_->RejectRequest(
+    const base::File::Error retry = request_manager_->RejectRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue()), error);
-    EXPECT_FALSE(retry);
+    EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, retry);
     EXPECT_EQ(1u, observer.rejected().size());
   }
 
   ASSERT_EQ(1u, observer.destroyed().size());
   EXPECT_EQ(request_id, observer.destroyed()[0].request_id());
   EXPECT_EQ(0u, observer.timeouted().size());
 
   request_manager_->RemoveObserver(&observer);
 }
 
@@ skipping 14 matching lines @@
 
   ASSERT_EQ(1u, observer.created().size());
   EXPECT_EQ(request_id, observer.created()[0].request_id());
   EXPECT_EQ(TESTING, observer.created()[0].type());
 
   ASSERT_EQ(1u, observer.executed().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   const bool has_more = true;
 
-  const bool result = request_manager_->FulfillRequest(
+  const base::File::Error result = request_manager_->FulfillRequest(
       request_id + 1, scoped_ptr<RequestValue>(new RequestValue), has_more);
-  EXPECT_FALSE(result);
+  EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, result);
 
   // Callbacks should not be called.
   EXPECT_EQ(0u, logger.error_events().size());
   EXPECT_EQ(0u, logger.success_events().size());
 
   EXPECT_EQ(0u, observer.fulfilled().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   // Confirm, that the request hasn't been removed, by fulfilling it correctly.
   {
-    const bool retry = request_manager_->FulfillRequest(
+    const base::File::Error retry = request_manager_->FulfillRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue), has_more);
-    EXPECT_TRUE(retry);
+    EXPECT_EQ(base::File::FILE_OK, retry);
     EXPECT_EQ(1u, observer.fulfilled().size());
   }
 
   request_manager_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderRequestManagerTest,
        CreateAndRejectWithWrongRequestId) {
   EventLogger logger;
   RequestObserver observer;
   request_manager_->AddObserver(&observer);
 
   const int request_id = request_manager_->CreateRequest(
       TESTING,
       make_scoped_ptr<RequestManager::HandlerInterface>(
           new FakeHandler(logger.GetWeakPtr(), true /* execute_reply */)));
 
   EXPECT_EQ(1, request_id);
   EXPECT_EQ(0u, logger.success_events().size());
   EXPECT_EQ(0u, logger.error_events().size());
 
   ASSERT_EQ(1u, observer.created().size());
   EXPECT_EQ(request_id, observer.created()[0].request_id());
   EXPECT_EQ(TESTING, observer.created()[0].type());
 
   ASSERT_EQ(1u, observer.executed().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
-  base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
-  bool result = request_manager_->RejectRequest(
+  const base::File::Error error = base::File::FILE_ERROR_NO_MEMORY;
+  const base::File::Error result = request_manager_->RejectRequest(
       request_id + 1, scoped_ptr<RequestValue>(new RequestValue()), error);
-  EXPECT_FALSE(result);
+  EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, result);
 
   // Callbacks should not be called.
   EXPECT_EQ(0u, logger.error_events().size());
   EXPECT_EQ(0u, logger.success_events().size());
 
   EXPECT_EQ(0u, observer.rejected().size());
 
   // Confirm, that the request hasn't been removed, by rejecting it correctly.
   {
-    bool retry = request_manager_->RejectRequest(
+    const base::File::Error retry = request_manager_->RejectRequest(
         request_id, scoped_ptr<RequestValue>(new RequestValue()), error);
-    EXPECT_TRUE(retry);
+    EXPECT_EQ(base::File::FILE_OK, retry);
     EXPECT_EQ(1u, observer.rejected().size());
   }
 
   request_manager_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderRequestManagerTest, UniqueIds) {
   EventLogger logger;
 
   const int first_request_id = request_manager_->CreateRequest(
@@ skipping 139 matching lines @@
 
   // Wait until the request is timeouted again.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1u, notification_manager_->size());
 
   request_manager_->RemoveObserver(&observer);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos