[Fuchsia] Migrate call-sites from rea2() back to read().

zx::channel::read() now has the correct parameter order, so migrate to
that, to allow rea2() to be removed.

TBR=kmarshall

Bug: 953523
Change-Id: I622531739609c0dfb935d44416687d7eca9a9567
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1582541Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Auto-Submit: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653636}

build/fuchsia/fidlgen_js/runtime/zircon.cc

@@ -243,7 +243,7 @@ v8::Local<v8::Object> ZxChannelRead(gin::Arguments* args) {
   uint32_t data_size;
   uint32_t num_handles;
   zx_status_t status =
-      ch->rea2(0, nullptr, nullptr, 0, 0, &data_size, &num_handles);
+      ch->read(0, nullptr, nullptr, 0, 0, &data_size, &num_handles);
   DCHECK_EQ(status, ZX_ERR_BUFFER_TOO_SMALL);
 
   std::vector<zx_handle_t> handles;
@@ -252,7 +252,7 @@ v8::Local<v8::Object> ZxChannelRead(gin::Arguments* args) {
   v8::Local<v8::ArrayBuffer> buf =
       v8::ArrayBuffer::New(args->isolate(), data_size);
   uint32_t actual_bytes, actual_handles;
-  status = ch->rea2(0, buf->GetContents().Data(), handles.data(), data_size,
+  status = ch->read(0, buf->GetContents().Data(), handles.data(), data_size,
                     handles.size(), &actual_bytes, &actual_handles);
   DCHECK_EQ(actual_bytes, data_size);
   DCHECK_EQ(actual_handles, num_handles);

build/fuchsia/fidlgen_js/test/fidlgen_js_unittest.cc

@@ -544,7 +544,7 @@ TEST_F(FidlGenJsTest, RawReceiveFidlMessage) {
   zx_handle_t handles[1];
   uint32_t actual_bytes, actual_handles;
   ASSERT_EQ(
-      helper.server().rea2(0, data, handles, base::size(data),
+      helper.server().read(0, data, handles, base::size(data),
                            base::size(handles), &actual_bytes, &actual_handles),
       ZX_OK);
   EXPECT_EQ(actual_bytes, 16u);
@@ -577,7 +577,7 @@ TEST_F(FidlGenJsTest, RawReceiveFidlMessageWithSimpleArg) {
   zx_handle_t handles[1];
   uint32_t actual_bytes, actual_handles;
   ASSERT_EQ(
-      helper.server().rea2(0, data, handles, base::size(data),
+      helper.server().read(0, data, handles, base::size(data),
                            base::size(handles), &actual_bytes, &actual_handles),
       ZX_OK);
   // 24 rather than 20 because everything's 8 aligned.
@@ -611,7 +611,7 @@ TEST_F(FidlGenJsTest, RawReceiveFidlMessageWithStringArg) {
   zx_handle_t handles[1];
   uint32_t actual_bytes, actual_handles;
   ASSERT_EQ(
-      helper.server().rea2(0, data, handles, base::size(data),
+      helper.server().read(0, data, handles, base::size(data),
                            base::size(handles), &actual_bytes, &actual_handles),
       ZX_OK);
   EXPECT_EQ(actual_handles, 0u);
@@ -643,7 +643,7 @@ TEST_F(FidlGenJsTest, RawReceiveFidlMessageWithMultipleArgs) {
   zx_handle_t handles[1];
   uint32_t actual_bytes, actual_handles;
   ASSERT_EQ(
-      helper.server().rea2(0, data, handles, base::size(data),
+      helper.server().read(0, data, handles, base::size(data),
                            base::size(handles), &actual_bytes, &actual_handles),
       ZX_OK);
   EXPECT_EQ(actual_handles, 0u);

mojo/core/channel_fuchsia.cc

@@ -300,7 +300,7 @@ class ChannelFuchsia : public Channel,
       zx_handle_t handles[ZX_CHANNEL_MAX_MSG_HANDLES] = {};
 
       zx_status_t read_result =
-          handle_.rea2(0, buffer, handles, buffer_capacity, base::size(handles),
+          handle_.read(0, buffer, handles, buffer_capacity, base::size(handles),
                        &bytes_read, &handles_read);
       if (read_result == ZX_OK) {
         for (size_t i = 0; i < handles_read; ++i) {