| Index: content/browser/loader/mojo_async_resource_handler.h
|
| diff --git a/content/browser/loader/mojo_async_resource_handler.h b/content/browser/loader/mojo_async_resource_handler.h
|
| index 7e60a962d63725f1be3726057350169538affcdc..25dc6fa673574e2d2f8d905f7c9193cc4756f6b8 100644
|
| --- a/content/browser/loader/mojo_async_resource_handler.h
|
| +++ b/content/browser/loader/mojo_async_resource_handler.h
|
| @@ -16,7 +16,7 @@
|
| #include "content/browser/loader/resource_handler.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/url_loader.mojom.h"
|
| -#include "mojo/public/cpp/bindings/binding.h"
|
| +#include "mojo/public/cpp/bindings/associated_binding.h"
|
| #include "mojo/public/cpp/system/watcher.h"
|
| #include "net/base/io_buffer.h"
|
| #include "url/gurl.h"
|
| @@ -47,8 +47,8 @@ class CONTENT_EXPORT MojoAsyncResourceHandler
|
| MojoAsyncResourceHandler(
|
| net::URLRequest* request,
|
| ResourceDispatcherHostImpl* rdh,
|
| - mojo::InterfaceRequest<mojom::URLLoader> mojo_request,
|
| - mojom::URLLoaderClientPtr url_loader_client);
|
| + mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderClientAssociatedPtr url_loader_client);
|
| ~MojoAsyncResourceHandler() override;
|
|
|
| // ResourceHandler implementation:
|
| @@ -97,7 +97,7 @@ class CONTENT_EXPORT MojoAsyncResourceHandler
|
| void OnWritable(MojoResult result);
|
|
|
| ResourceDispatcherHostImpl* rdh_;
|
| - mojo::Binding<mojom::URLLoader> binding_;
|
| + mojo::AssociatedBinding<mojom::URLLoader> binding_;
|
|
|
| bool has_checked_for_sufficient_resources_ = false;
|
| bool sent_received_response_message_ = false;
|
| @@ -107,7 +107,7 @@ class CONTENT_EXPORT MojoAsyncResourceHandler
|
|
|
| mojo::Watcher handle_watcher_;
|
| std::unique_ptr<mojom::URLLoader> url_loader_;
|
| - mojom::URLLoaderClientPtr url_loader_client_;
|
| + mojom::URLLoaderClientAssociatedPtr url_loader_client_;
|
| scoped_refptr<net::IOBufferWithSize> buffer_;
|
| size_t buffer_offset_ = 0;
|
| size_t buffer_bytes_read_ = 0;
|
|
|