[Mojo-Loading] Use independent URLLoaderClient

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 <vector>
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 32 matching lines @@
   void TearDown() override {
     url_loader_client_ = nullptr;
     url_loader_factory_proxy_ = nullptr;
   }
 
   bool Send(IPC::Message* message) override {
     ADD_FAILURE() << "IPC::Sender::Send should not be called.";
     return false;
   }
 
-  void CreateLoaderAndStart(
-      mojom::URLLoaderAssociatedRequest request,
-      int32_t routing_id,
-      int32_t request_id,
-      const ResourceRequest& url_request,
-      mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info) override {
-    url_loader_client_.Bind(std::move(client_ptr_info));
+  void CreateLoaderAndStart(mojom::URLLoaderAssociatedRequest request,
+                            int32_t routing_id,
+                            int32_t request_id,
+                            const ResourceRequest& url_request,
+                            mojom::URLLoaderClientPtr client) override {
+    url_loader_client_ = std::move(client);
   }
 
   void SyncLoad(int32_t routing_id,
                 int32_t request_id,
                 const ResourceRequest& request,
                 const SyncLoadCallback& callback) override {
     NOTREACHED();
   }
 
   static MojoCreateDataPipeOptions DataPipeOptions() {
     MojoCreateDataPipeOptions options;
     options.struct_size = sizeof(MojoCreateDataPipeOptions);
     options.flags = MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE;
     options.element_num_bytes = 1;
     options.capacity_num_bytes = 4096;
     return options;
   }
 
   base::MessageLoop message_loop_;
   std::unique_ptr<ResourceDispatcher> dispatcher_;
   TestRequestPeer::Context request_peer_context_;
   int request_id_ = 0;
-  mojom::URLLoaderClientAssociatedPtr url_loader_client_;
+  mojom::URLLoaderClientPtr url_loader_client_;
   mojom::URLLoaderFactoryPtr url_loader_factory_proxy_;
   mojo::Binding<mojom::URLLoaderFactory> mojo_binding_;
 };
 
 TEST_F(URLLoaderClientImplTest, OnReceiveResponse) {
   ResourceResponseHead response_head;
 
   url_loader_client_->OnReceiveResponse(response_head, nullptr);
 
   EXPECT_FALSE(request_peer_context_.received_response);
@@ skipping 425 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