Replace sized_buffer with buffer in the http service.

The sized_buffer mode was renamed to buffer in Garnet. This change
keeps the service implementation in sync. See:
https://fuchsia-review.googlesource.com/c/garnet/+/201201
https://fuchsia-review.googlesource.com/c/garnet/+/201203

Bug: 874155
Change-Id: I74061afd6e92d0397c286391efbd36f02373008c
Reviewed-on: https://chromium-review.googlesource.com/1243569
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594004}

webrunner/net_http/service/url_loader_impl.cc

@@ -21,9 +21,8 @@ namespace {
 // server responses.
 const size_t kReadCapacity = 1024;
 
-// Converts |buffer| into a URLBody with the body set to a sized buffer.
-oldhttp::URLBodyPtr BuildResponseBuffer(
-    scoped_refptr<net::GrowableIOBuffer> buffer) {
+// Converts |buffer| into a URLBody with the body set to a buffer.
+oldhttp::URLBodyPtr CreateURLBodyFromBuffer(net::GrowableIOBuffer* buffer) {
   oldhttp::URLBodyPtr body = oldhttp::URLBody::New();
 
   // The response buffer size is exactly the offset.
@@ -37,7 +36,7 @@ oldhttp::URLBodyPtr BuildResponseBuffer(
     ZX_DLOG(WARNING, result) << "zx_vmo_write";
     return nullptr;
   }
-  body->set_sized_buffer(std::move(mem_buffer));
+  body->set_buffer(std::move(mem_buffer));
 
   return body;
 }
@@ -84,18 +83,18 @@ std::unique_ptr<UploadDataStream> UploadDataStreamFromZxSocket(
 }
 
 std::unique_ptr<UploadDataStream> UploadDataStreamFromMemBuffer(
-    fuchsia::mem::Buffer sized_buffer) {
+    fuchsia::mem::Buffer mem_buffer) {
   // TODO(http://crbug.com/875534): Write a ZxMemBufferUploadStream class.
   std::unique_ptr<ChunkedUploadDataStream> upload_stream =
       std::make_unique<net::ChunkedUploadDataStream>(0);
 
   char buffer[kReadCapacity];
-  size_t size = sized_buffer.size;
+  size_t size = mem_buffer.size;
   size_t offset = 0;
   zx_status_t result = ZX_OK;
   while (offset != size) {
     size_t length = std::min(size - offset, kReadCapacity);
-    result = sized_buffer.vmo.read(buffer, offset, length);
+    result = mem_buffer.vmo.read(buffer, offset, length);
     if (result != ZX_OK) {
       ZX_DLOG(WARNING, result) << "zx_vmo_read";
       return nullptr;
@@ -153,8 +152,8 @@ void URLLoaderImpl::Start(oldhttp::URLRequest request, Callback callback) {
       upload_stream =
           UploadDataStreamFromZxSocket(std::move(request.body->stream()));
     } else {
-      upload_stream = UploadDataStreamFromMemBuffer(
-          std::move(request.body->sized_buffer()));
+      upload_stream =
+          UploadDataStreamFromMemBuffer(std::move(request.body->buffer()));
     }
 
     if (!upload_stream) {
@@ -311,7 +310,7 @@ bool URLLoaderImpl::WriteResponseBytes(int result) {
       // way to recover from a failed socket close.
       write_socket_ = zx::socket();
     } else {
-      DCHECK_EQ(response_body_mode_, oldhttp::ResponseBodyMode::SIZED_BUFFER);
+      DCHECK_EQ(response_body_mode_, oldhttp::ResponseBodyMode::BUFFER);
       std::move(done_callback_)(BuildResponse(result));
     }
     return false;
@@ -327,9 +326,9 @@ bool URLLoaderImpl::WriteResponseBytes(int result) {
       write_socket_.write(ZX_SOCKET_SHUTDOWN_WRITE, nullptr, 0, nullptr);
       write_socket_ = zx::socket();
     } else {
-      DCHECK_EQ(response_body_mode_, oldhttp::ResponseBodyMode::SIZED_BUFFER);
+      DCHECK_EQ(response_body_mode_, oldhttp::ResponseBodyMode::BUFFER);
       // In buffer mode, build the response and call the callback.
-      oldhttp::URLBodyPtr body = BuildResponseBuffer(buffer_);
+      oldhttp::URLBodyPtr body = CreateURLBodyFromBuffer(buffer_.get());
       if (body) {
         oldhttp::URLResponse response = BuildResponse(result);
         response.body = std::move(body);
@@ -363,7 +362,7 @@ bool URLLoaderImpl::WriteResponseBytes(int result) {
       return false;
     }
   } else {
-    DCHECK_EQ(response_body_mode_, oldhttp::ResponseBodyMode::SIZED_BUFFER);
+    DCHECK_EQ(response_body_mode_, oldhttp::ResponseBodyMode::BUFFER);
     // In buffer mode, expand the buffer.
     buffer_->SetCapacity(buffer_->capacity() + result);
     buffer_->set_offset(buffer_->offset() + result);