| Index: content/child/url_loader_client_impl.h
|
| diff --git a/content/child/url_loader_client_impl.h b/content/child/url_loader_client_impl.h
|
| index 46126a81ad9c4ef18b513e6f907ad853cee07a9e..da14b03e56d1e90ccccdce9723150ed5a52b71ef 100644
|
| --- a/content/child/url_loader_client_impl.h
|
| +++ b/content/child/url_loader_client_impl.h
|
| @@ -13,7 +13,7 @@
|
| #include "content/common/content_export.h"
|
| #include "content/common/url_loader.mojom.h"
|
| #include "ipc/ipc_message.h"
|
| -#include "mojo/public/cpp/bindings/associated_binding.h"
|
| +#include "mojo/public/cpp/bindings/binding.h"
|
| #include "mojo/public/cpp/system/data_pipe.h"
|
|
|
| namespace base {
|
| @@ -37,7 +37,7 @@ class CONTENT_EXPORT URLLoaderClientImpl final : public mojom::URLLoaderClient {
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner);
|
| ~URLLoaderClientImpl() override;
|
|
|
| - void Bind(mojom::URLLoaderClientAssociatedPtrInfo* client_ptr_info);
|
| + void Bind(mojom::URLLoaderClientPtr* client_ptr);
|
|
|
| // Sets |is_deferred_|. From now, the received messages are not dispatched
|
| // to clients until UnsetDefersLoading is called.
|
| @@ -50,9 +50,8 @@ class CONTENT_EXPORT URLLoaderClientImpl final : public mojom::URLLoaderClient {
|
| void FlushDeferredMessages();
|
|
|
| // mojom::URLLoaderClient implementation
|
| - void OnReceiveResponse(
|
| - const ResourceResponseHead& response_head,
|
| - mojom::DownloadedTempFileAssociatedPtrInfo downloaded_file) override;
|
| + void OnReceiveResponse(const ResourceResponseHead& response_head,
|
| + mojom::DownloadedTempFilePtr downloaded_file) override;
|
| void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
|
| const ResourceResponseHead& response_head) override;
|
| void OnDataDownloaded(int64_t data_len, int64_t encoded_data_len) override;
|
| @@ -68,9 +67,9 @@ class CONTENT_EXPORT URLLoaderClientImpl final : public mojom::URLLoaderClient {
|
| private:
|
| void Dispatch(const IPC::Message& message);
|
|
|
| - mojo::AssociatedBinding<mojom::URLLoaderClient> binding_;
|
| + mojo::Binding<mojom::URLLoaderClient> binding_;
|
| scoped_refptr<URLResponseBodyConsumer> body_consumer_;
|
| - mojom::DownloadedTempFileAssociatedPtr downloaded_file_;
|
| + mojom::DownloadedTempFilePtr downloaded_file_;
|
| std::vector<IPC::Message> deferred_messages_;
|
| const int request_id_;
|
| bool has_received_response_ = false;
|
|
|