Handle correctly "ShouldWait" result of mojo::Wait() in WebDataConsumerHandleImpl.

content/child/web_data_consumer_handle_impl.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 "content/child/web_data_consumer_handle_impl.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 43 matching lines @@
   DCHECK_EQ(flags, kNone);
   DCHECK_LE(size, std::numeric_limits<uint32_t>::max());
 
   *read_size = 0;
 
   if (!size) {
     // Even if there is unread data available, mojo::ReadDataRaw() returns
     // FAILED_PRECONDITION when |size| is 0 and the producer handle was closed.
     // But in this case, WebDataConsumerHandle::Reader::read() must return Ok.
     // So we use mojo::Wait() with 0 deadline to check whether readable or not.
-    return HandleReadResult(mojo::Wait(
-        context_->handle().get(), MOJO_HANDLE_SIGNAL_READABLE, 0, nullptr));
+    MojoResult wait_result = mojo::Wait(
+        context_->handle().get(), MOJO_HANDLE_SIGNAL_READABLE, 0, nullptr);
+    switch (wait_result) {
+      case MOJO_RESULT_OK:
+        return Ok;
+      case MOJO_RESULT_FAILED_PRECONDITION:
+        return Done;
+      case MOJO_RESULT_DEADLINE_EXCEEDED:
+        return ShouldWait;
+      default:
+        return UnexpectedError;

[yhirano, 2017/01/18 08:34:21]

NOTREACHED() according to
https://cs.chromium.org/chromium/src/mojo/public/c/system/functions.h?q=MOJO_...
?

[horo, 2017/01/18 09:37:08]

Done.

+    }
   }
 
   uint32_t size_to_pass = size;
   MojoReadDataFlags flags_to_pass = MOJO_READ_DATA_FLAG_NONE;
   MojoResult rv = mojo::ReadDataRaw(context_->handle().get(), data,
                                     &size_to_pass, flags_to_pass);
   if (rv == MOJO_RESULT_OK)
     *read_size = size_to_pass;
 
   return HandleReadResult(rv);
@@ skipping 62 matching lines @@
 std::unique_ptr<blink::WebDataConsumerHandle::Reader>
 WebDataConsumerHandleImpl::obtainReader(Client* client) {
   return base::WrapUnique(new ReaderImpl(context_, client));
 }
 
 const char* WebDataConsumerHandleImpl::debugName() const {
   return "WebDataConsumerHandleImpl";
 }
 
 }  // namespace content