Use Associated interfaces for mojo-loading

content/browser/loader/url_loader_factory_impl.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/browser/loader/url_loader_factory_impl.h"
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/common/resource_request.h"
 #include "content/common/url_loader.mojom.h"
@@ skipping 27 matching lines @@
     : resource_message_filter_(std::move(resource_message_filter)) {
   DCHECK(resource_message_filter_);
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
 
 URLLoaderFactoryImpl::~URLLoaderFactoryImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
 
 void URLLoaderFactoryImpl::CreateLoaderAndStart(
-    mojom::URLLoaderRequest request,
+    mojom::URLLoaderAssociatedRequest request,
     int32_t routing_id,
     int32_t request_id,
     const ResourceRequest& url_request,
-    mojom::URLLoaderClientPtr client) {
+    mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info) {
   CreateLoaderAndStart(std::move(request), routing_id, request_id, url_request,
-                       std::move(client), resource_message_filter_.get());
+                       std::move(client_ptr_info),
+                       resource_message_filter_.get());
 }
 
 void URLLoaderFactoryImpl::SyncLoad(int32_t routing_id,
                                     int32_t request_id,
                                     const ResourceRequest& url_request,
                                     const SyncLoadCallback& callback) {
   SyncLoad(routing_id, request_id, url_request, callback,
            resource_message_filter_.get());
 }
 
 // static
 void URLLoaderFactoryImpl::CreateLoaderAndStart(
-    mojom::URLLoaderRequest request,
+    mojom::URLLoaderAssociatedRequest request,
     int32_t routing_id,
     int32_t request_id,
     const ResourceRequest& url_request,
-    mojom::URLLoaderClientPtr client,
+    mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info,
     ResourceMessageFilter* filter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
+  mojom::URLLoaderClientAssociatedPtr client;
+  client.Bind(std::move(client_ptr_info));
+
   ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
   rdh->OnRequestResourceWithMojo(routing_id, request_id, url_request,
                                  std::move(request), std::move(client), filter);
 }
 
 // static
 void URLLoaderFactoryImpl::SyncLoad(int32_t routing_id,
                                     int32_t request_id,
                                     const ResourceRequest& url_request,
                                     const SyncLoadCallback& callback,
                                     ResourceMessageFilter* filter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
   rdh->OnSyncLoadWithMojo(routing_id, request_id, url_request, filter,
                           base::Bind(&DispatchSyncLoadResult, callback));
 }
 
 void URLLoaderFactoryImpl::Create(
     scoped_refptr<ResourceMessageFilter> filter,
     mojo::InterfaceRequest<mojom::URLLoaderFactory> request) {
   mojo::MakeStrongBinding(
       base::WrapUnique(new URLLoaderFactoryImpl(std::move(filter))),
       std::move(request));
 }
 
 }  // namespace content