[fsp] Rename has_next to has_more.

chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.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/fileapi/file_stream_reader.h"
 
 #include "base/files/file.h"
 #include "chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h"
 #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
@@ skipping 58 matching lines @@
 // Closes a file. Ignores result, since it is called from a constructor.
 // Must be called on UI thread.
 void CloseFileOnUIThread(base::WeakPtr<ProvidedFileSystemInterface> file_system,
                          int file_handle) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (file_system.get())
     file_system->CloseFile(file_handle, base::Bind(&EmptyStatusCallback));
 }
 
 // Requests reading contents of a file. In case of either success or a failure
-// |callback| is executed. It can be called many times, until |has_next| is set
+// |callback| is executed. It can be called many times, until |has_more| is set
 // to false. This function guarantees that it will succeed only if the file has
 // not been changed while reading. Must be called on UI thread.
 void ReadFileOnUIThread(
     base::WeakPtr<ProvidedFileSystemInterface> file_system,
     int file_handle,
     net::IOBuffer* buffer,
     int64 offset,
     int length,
     const ProvidedFileSystemInterface::ReadChunkReceivedCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If the file system got unmounted, then abort the reading operation.
   if (!file_system.get()) {
-    callback.Run(0, false /* has_next */, base::File::FILE_ERROR_ABORT);
+    callback.Run(0, false /* has_more */, base::File::FILE_ERROR_ABORT);
     return;
   }
 
   file_system->ReadFile(file_handle, buffer, offset, length, callback);
 }
 
 // Forward the completion callback to IO thread.
 void OnReadChunkReceivedOnUIThread(
     const ProvidedFileSystemInterface::ReadChunkReceivedCallback&
         chunk_received_callback,
     int chunk_length,
-    bool has_next,
+    bool has_more,
     base::File::Error result) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
-      base::Bind(chunk_received_callback, chunk_length, has_next, result));
+      base::Bind(chunk_received_callback, chunk_length, has_more, result));
 }
 
 // Requests metadata of a file. In case of either succes or a failure,
 // |callback is executed. Must be called on UI thread.
 void GetMetadataOnUIThread(
     base::WeakPtr<ProvidedFileSystemInterface> file_system,
     const base::FilePath& file_path,
     const fileapi::AsyncFileUtil::GetFileInfoCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ skipping 158 matching lines @@
           base::Bind(
               &OnGetMetadataReceivedOnUIThread,
               base::Bind(&FileStreamReader::OnGetMetadataForGetLengthReceived,
                          weak_ptr_factory_.GetWeakPtr(),
                          callback))));
 }
 
 void FileStreamReader::OnReadChunkReceived(
     const net::CompletionCallback& callback,
     int chunk_length,
-    bool has_next,
+    bool has_more,
     base::File::Error result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   current_length_ += chunk_length;
 
   // If this is the last chunk with a success, then finalize.
-  if (!has_next && result == base::File::FILE_OK) {
+  if (!has_more && result == base::File::FILE_OK) {
     current_offset_ += current_length_;
     callback.Run(current_length_);
     return;
   }
 
   // In case of an error, abort.
   if (result != base::File::FILE_OK) {
-    DCHECK(!has_next);
+    DCHECK(!has_more);
     callback.Run(net::FileErrorToNetError(result));
     return;
   }
 
   // More data is about to come, so do not call the callback yet.
-  DCHECK(has_next);
+  DCHECK(has_more);
 }
 
 void FileStreamReader::OnGetMetadataForGetLengthReceived(
     const net::Int64CompletionCallback& callback,
     base::File::Error result,
     const base::File::Info& file_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // In case of an error, abort.
   if (result != base::File::FILE_OK) {
     callback.Run(net::FileErrorToNetError(result));
     return;
   }
 
   DCHECK_EQ(result, base::File::FILE_OK);
   callback.Run(file_info.size);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos