[Mojo-Loading] OnStartLoadingResponseBody should be called after OnReceiveResponse

content/child/url_loader_client_impl_unittest.cc

 // Copyright 2016 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/url_loader_client_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/child/resource_dispatcher.h"
@@ skipping 99 matching lines @@
   MojoResult result =
       mojo::WriteDataRaw(data_pipe.producer_handle.get(), "hello", &size,
                          MOJO_WRITE_DATA_FLAG_NONE);
   ASSERT_EQ(MOJO_RESULT_OK, result);
   EXPECT_EQ(5u, size);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ("hello", request_peer_context_.data);
 }
 
-// OnStartLoadingResponseBody can be called before OnReceiveResponse. Because
-// of the lack of the ordering guarantee between the message channel and the
-// data pipe, bytes can arrive before OnReceiveResponse. URLLoaderClientImpl
-// should restore the order.
-TEST_F(URLLoaderClientImplTest, ResponseBodyShouldComeAfterResponse) {
-  ResourceResponseHead response_head;
-
-  mojo::DataPipe data_pipe(DataPipeOptions());
-  url_loader_client_->OnStartLoadingResponseBody(
-      std::move(data_pipe.consumer_handle));
-  uint32_t size = 5;
-  MojoResult result =
-      mojo::WriteDataRaw(data_pipe.producer_handle.get(), "hello", &size,
-                         MOJO_WRITE_DATA_FLAG_NONE);
-  ASSERT_EQ(MOJO_RESULT_OK, result);
-  EXPECT_EQ(5u, size);
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ("", request_peer_context_.data);
-
-  url_loader_client_->OnReceiveResponse(response_head, nullptr);
-
-  EXPECT_FALSE(request_peer_context_.received_response);
-  EXPECT_EQ("", request_peer_context_.data);
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(request_peer_context_.received_response);
-  EXPECT_EQ("hello", request_peer_context_.data);
-}
-
 TEST_F(URLLoaderClientImplTest, OnReceiveRedirect) {
   ResourceResponseHead response_head;
   net::RedirectInfo redirect_info;
 
   url_loader_client_->OnReceiveRedirect(redirect_info, response_head);
 
   EXPECT_EQ(0, request_peer_context_.seen_redirects);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, request_peer_context_.seen_redirects);
 }
@@ skipping 101 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ("hello", request_peer_context_.data);
   EXPECT_FALSE(request_peer_context_.complete);
 
   data_pipe.producer_handle.reset();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ("hello", request_peer_context_.data);
   EXPECT_TRUE(request_peer_context_.complete);
 }
 
-TEST_F(URLLoaderClientImplTest, CancelOnReceiveResponseWithoutResponseBody) {
+TEST_F(URLLoaderClientImplTest, CancelOnReceiveResponse) {
   request_peer_context_.cancel_on_receive_response = true;
 
   ResourceResponseHead response_head;
   ResourceRequestCompletionStatus completion_status;
 
   url_loader_client_->OnReceiveResponse(response_head, nullptr);
   mojo::DataPipe data_pipe(DataPipeOptions());
   url_loader_client_->OnStartLoadingResponseBody(
       std::move(data_pipe.consumer_handle));
   url_loader_client_->OnComplete(completion_status);
 
   EXPECT_FALSE(request_peer_context_.received_response);
   EXPECT_FALSE(request_peer_context_.complete);
   EXPECT_FALSE(request_peer_context_.cancelled);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(request_peer_context_.received_response);
   EXPECT_FALSE(request_peer_context_.complete);
   EXPECT_TRUE(request_peer_context_.cancelled);
 }
 
-TEST_F(URLLoaderClientImplTest, CancelOnReceiveResponseWithResponseBody) {
-  request_peer_context_.cancel_on_receive_response = true;
-
-  ResourceResponseHead response_head;
-  ResourceRequestCompletionStatus completion_status;
-
-  mojo::DataPipe data_pipe(DataPipeOptions());
-  uint32_t size = 5;
-  MojoResult result =
-      mojo::WriteDataRaw(data_pipe.producer_handle.get(), "hello", &size,
-                         MOJO_WRITE_DATA_FLAG_NONE);
-  ASSERT_EQ(MOJO_RESULT_OK, result);
-  EXPECT_EQ(5u, size);
-
-  url_loader_client_->OnStartLoadingResponseBody(
-      std::move(data_pipe.consumer_handle));
-  base::RunLoop().RunUntilIdle();
-  url_loader_client_->OnReceiveResponse(response_head, nullptr);
-  url_loader_client_->OnComplete(completion_status);
-
-  EXPECT_FALSE(request_peer_context_.received_response);
-  EXPECT_FALSE(request_peer_context_.complete);
-  EXPECT_FALSE(request_peer_context_.cancelled);
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(request_peer_context_.received_response);
-  EXPECT_FALSE(request_peer_context_.complete);
-  EXPECT_TRUE(request_peer_context_.cancelled);
-}
-
 TEST_F(URLLoaderClientImplTest, CancelOnReceiveData) {
   request_peer_context_.cancel_on_receive_data = true;
 
   ResourceResponseHead response_head;
   ResourceRequestCompletionStatus completion_status;
 
   mojo::DataPipe data_pipe(DataPipeOptions());
   uint32_t size = 5;
   MojoResult result =
       mojo::WriteDataRaw(data_pipe.producer_handle.get(), "hello", &size,
                          MOJO_WRITE_DATA_FLAG_NONE);
   ASSERT_EQ(MOJO_RESULT_OK, result);
   EXPECT_EQ(5u, size);
 
+  url_loader_client_->OnReceiveResponse(response_head, nullptr);
   url_loader_client_->OnStartLoadingResponseBody(
       std::move(data_pipe.consumer_handle));
-  base::RunLoop().RunUntilIdle();
-  url_loader_client_->OnReceiveResponse(response_head, nullptr);
   url_loader_client_->OnComplete(completion_status);
 
   EXPECT_FALSE(request_peer_context_.received_response);
   EXPECT_EQ("", request_peer_context_.data);
   EXPECT_FALSE(request_peer_context_.complete);
   EXPECT_FALSE(request_peer_context_.cancelled);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(request_peer_context_.received_response);
   EXPECT_EQ("hello", request_peer_context_.data);
@@ skipping 212 matching lines @@
 
   dispatcher_->SetDefersLoading(request_id_, false);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(request_peer_context_.received_response);
   EXPECT_TRUE(request_peer_context_.complete);
   EXPECT_EQ(4, request_peer_context_.total_encoded_data_length);
   EXPECT_FALSE(request_peer_context_.cancelled);
 }
 
 }  // namespace content