[fsp] Rename has_next to has_more.

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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file.h"
@@ skipping 20 matching lines @@
     virtual ~ExecuteEvent() {}
 
     int request_id() { return request_id_; }
 
    private:
     int request_id_;
   };
 
   class SuccessEvent {
    public:
-    SuccessEvent(int request_id, scoped_ptr<RequestValue> result, bool has_next)
+    SuccessEvent(int request_id, scoped_ptr<RequestValue> result, bool has_more)
         : request_id_(request_id),
           result_(result.Pass()),
-          has_next_(has_next) {}
+          has_more_(has_more) {}
     virtual ~SuccessEvent() {}
 
     int request_id() { return request_id_; }
     RequestValue* result() { return result_.get(); }
-    bool has_next() { return has_next_; }
+    bool has_more() { return has_more_; }
 
    private:
     int request_id_;
     scoped_ptr<RequestValue> result_;
-    bool has_next_;
+    bool has_more_;
   };
 
   class ErrorEvent {
    public:
     ErrorEvent(int request_id, base::File::Error error)
         : request_id_(request_id), error_(error) {}
     virtual ~ErrorEvent() {}
 
     int request_id() { return request_id_; }
     base::File::Error error() { return error_; }
 
    private:
     int request_id_;
     base::File::Error error_;
   };
 
   EventLogger() : weak_ptr_factory_(this) {}
   virtual ~EventLogger() {}
 
   void OnExecute(int request_id) {
     execute_events_.push_back(new ExecuteEvent(request_id));
   }
 
   void OnSuccess(int request_id,
                  scoped_ptr<RequestValue> result,
-                 bool has_next) {
+                 bool has_more) {
     success_events_.push_back(
-        new SuccessEvent(request_id, result.Pass(), has_next));
+        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));
   }
 
   ScopedVector<ExecuteEvent>& execute_events() { return execute_events_; }
   ScopedVector<SuccessEvent>& success_events() { return success_events_; }
   ScopedVector<ErrorEvent>& error_events() { return error_events_; }
 
@@ skipping 23 matching lines @@
   virtual bool Execute(int request_id) OVERRIDE {
     if (logger_.get())
       logger_->OnExecute(request_id);
 
     return execute_reply_;
   }
 
   // RequestManager::Handler overrides.
   virtual void OnSuccess(int request_id,
                          scoped_ptr<RequestValue> result,
-                         bool has_next) OVERRIDE {
+                         bool has_more) OVERRIDE {
     if (logger_.get())
-      logger_->OnSuccess(request_id, result.Pass(), has_next);
+      logger_->OnSuccess(request_id, result.Pass(), has_more);
   }
 
   // RequestManager::Handler overrides.
   virtual void OnError(int request_id, base::File::Error error) OVERRIDE {
     if (logger_.get())
       logger_->OnError(request_id, error);
   }
 
   virtual ~FakeHandler() {}
 
@@ skipping 158 matching lines @@
 
   ASSERT_EQ(1u, observer.created().size());
   EXPECT_EQ(request_id, observer.created()[0].request_id());
   EXPECT_EQ(RequestManager::TESTING, observer.created()[0].type());
 
   ASSERT_EQ(1u, observer.executed().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   scoped_ptr<RequestValue> response(
       RequestValue::CreateForTesting("i-like-vanilla"));
-  const bool has_next = false;
+  const bool has_more = false;
 
   bool result =
-      request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+      request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
   EXPECT_TRUE(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_next());
+  EXPECT_FALSE(event->has_more());
 
   // Confirm, that the request is removed. Basically, fulfilling again for the
   // same request, should fail.
   {
     scoped_ptr<RequestValue> response;
     bool retry =
-        request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+        request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
     EXPECT_FALSE(retry);
     EXPECT_EQ(1u, observer.fulfilled().size());
   }
 
   // Rejecting should also fail.
   {
     bool retry = request_manager_->RejectRequest(request_id,
                                                  base::File::FILE_ERROR_FAILED);
     EXPECT_FALSE(retry);
     EXPECT_EQ(0u, observer.rejected().size());
@@ skipping 21 matching lines @@
   EXPECT_EQ(0u, logger.error_events().size());
 
   ASSERT_EQ(1u, observer.created().size());
   EXPECT_EQ(request_id, observer.created()[0].request_id());
   EXPECT_EQ(RequestManager::TESTING, observer.created()[0].type());
 
   ASSERT_EQ(1u, observer.executed().size());
   EXPECT_EQ(request_id, observer.executed()[0].request_id());
 
   scoped_ptr<RequestValue> response;
-  const bool has_next = true;
+  const bool has_more = true;
 
   bool result =
-      request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+      request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
   EXPECT_TRUE(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_FALSE(event->result());
-  EXPECT_TRUE(event->has_next());
+  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_next == true).
+  // Confirm, that the request is not removed (since it has has_more == true).
   // Basically, fulfilling again for the same request, should not fail.
   {
-    bool new_has_next = false;
+    bool new_has_more = false;
     bool retry = request_manager_->FulfillRequest(
-        request_id, response.Pass(), new_has_next);
+        request_id, response.Pass(), new_has_more);
     EXPECT_TRUE(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_next| is false, then the request should be removed. To check
+  // Since |new_has_more| is false, then the request should be removed. To check
   // it, try to fulfill again, what should fail.
   {
-    bool new_has_next = false;
+    bool new_has_more = false;
     bool retry = request_manager_->FulfillRequest(
-        request_id, response.Pass(), new_has_next);
+        request_id, response.Pass(), new_has_more);
     EXPECT_FALSE(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 30 matching lines @@
   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.
   {
     scoped_ptr<RequestValue> response;
-    bool has_next = false;
+    bool has_more = false;
     bool retry =
-        request_manager_->FulfillRequest(request_id, response.Pass(), has_next);
+        request_manager_->FulfillRequest(request_id, response.Pass(), has_more);
     EXPECT_FALSE(retry);
     EXPECT_EQ(0u, observer.fulfilled().size());
   }
 
   // Rejecting should also fail.
   {
     bool retry = request_manager_->RejectRequest(request_id, error);
     EXPECT_FALSE(retry);
     EXPECT_EQ(1u, observer.rejected().size());
   }
@@ skipping 193 matching lines @@
   ASSERT_EQ(1u, observer.timeouted().size());
   EXPECT_EQ(request_id, observer.timeouted()[0].request_id());
   ASSERT_EQ(1u, observer.destroyed().size());
   EXPECT_EQ(request_id, observer.destroyed()[0].request_id());
 
   request_manager_->RemoveObserver(&observer);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos