Use Associated interfaces for mojo-loading

content/child/resource_dispatcher.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/child/resource_dispatcher.h"
 
 #include <utility>
 
@@ skipping 21 matching lines @@
 #include "content/common/navigation_params.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/public/child/fixed_received_data.h"
 #include "content/public/child/request_peer.h"
 #include "content/public/child/resource_dispatcher_delegate.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/resource_type.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "mojo/public/cpp/bindings/associated_group.h"
+#include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "net/base/net_errors.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
 
 namespace content {
 
 namespace {
 
 // Converts |time| from a remote to local TimeTicks, overwriting the original
 // value.
@@ skipping 49 matching lines @@
 
   void OnComplete(const ResourceRequestCompletionStatus& status) override {
     if (!body_consumer_) {
       resource_dispatcher_->OnMessageReceived(
           ResourceMsg_RequestComplete(request_id_, status));
       return;
     }
     body_consumer_->OnComplete(status);
   }
 
-  mojom::URLLoaderClientPtr CreateInterfacePtrAndBind() {
-    return binding_.CreateInterfacePtrAndBind();
+  void Bind(mojom::URLLoaderClientAssociatedPtrInfo* client_ptr_info,
+            mojo::AssociatedGroup* associated_group) {
+    binding_.Bind(client_ptr_info, associated_group);
   }
 
  private:
-  mojo::Binding<mojom::URLLoaderClient> binding_;
+  mojo::AssociatedBinding<mojom::URLLoaderClient> binding_;
   scoped_refptr<URLResponseBodyConsumer> body_consumer_;
   const int request_id_;
   ResourceDispatcher* const resource_dispatcher_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 };
 
 void CheckSchemeForReferrerPolicy(const ResourceRequest& request) {
   if ((request.referrer_policy == blink::WebReferrerPolicyDefault ||
        request.referrer_policy ==
            blink::WebReferrerPolicyNoReferrerWhenDowngrade) &&
@@ skipping 523 matching lines @@
   response->encoded_body_length = result.encoded_body_length;
 }
 
 int ResourceDispatcher::StartAsync(
     std::unique_ptr<ResourceRequest> request,
     int routing_id,
     scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner,
     const GURL& frame_origin,
     std::unique_ptr<RequestPeer> peer,
     blink::WebURLRequest::LoadingIPCType ipc_type,
-    mojom::URLLoaderFactory* url_loader_factory) {
+    mojom::URLLoaderFactory* url_loader_factory,
+    mojo::AssociatedGroup* associated_group) {
   CheckSchemeForReferrerPolicy(*request);
 
   // Compute a unique request_id for this renderer process.
   int request_id = MakeRequestID();
   pending_requests_[request_id] = base::MakeUnique<PendingRequestInfo>(
       std::move(peer), request->resource_type, request->origin_pid,
       frame_origin, request->url, request->download_to_file);
 
   if (resource_scheduling_filter_.get() && loading_task_runner) {
     resource_scheduling_filter_->SetRequestIdTaskRunner(request_id,
                                                         loading_task_runner);
   }
 
   if (ipc_type == blink::WebURLRequest::LoadingIPCType::Mojo) {
     std::unique_ptr<URLLoaderClientImpl> client(
         new URLLoaderClientImpl(request_id, this, main_thread_task_runner_));
-    mojom::URLLoaderPtr url_loader;
+    mojom::URLLoaderAssociatedPtr url_loader;
+    mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info;
+    client->Bind(&client_ptr_info, associated_group);
     url_loader_factory->CreateLoaderAndStart(
-        GetProxy(&url_loader), routing_id, request_id, *request,
-        client->CreateInterfacePtrAndBind());
+        GetProxy(&url_loader, associated_group), routing_id, request_id,
+        *request, std::move(client_ptr_info));
     pending_requests_[request_id]->url_loader = std::move(url_loader);
     pending_requests_[request_id]->url_loader_client = std::move(client);
   } else {
     message_sender_->Send(
         new ResourceHostMsg_RequestResource(routing_id, request_id, *request));
   }
 
   return request_id;
 }
 
@@ skipping 131 matching lines @@
     delete message;
   }
 }
 
 void ResourceDispatcher::SetResourceSchedulingFilter(
     scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) {
   resource_scheduling_filter_ = resource_scheduling_filter;
 }
 
 }  // namespace content