diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/arc/session/connection_holder.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/arc/session/connection_holder.h')
| -rw-r--r-- | chromium/components/arc/session/connection_holder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/components/arc/session/connection_holder.h b/chromium/components/arc/session/connection_holder.h index 0d35f5ff224..6dcfb061f3f 100644 --- a/chromium/components/arc/session/connection_holder.h +++ b/chromium/components/arc/session/connection_holder.h @@ -11,6 +11,7 @@ #include <utility> #include "base/bind.h" +#include "base/logging.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" @@ -133,8 +134,8 @@ class ConnectionHolderImpl { // When both the instance and host are ready, start connection. // TODO(crbug.com/750563): Fix the race issue. auto receiver = std::make_unique<mojo::Receiver<HostType>>(host_); - mojo::InterfacePtr<HostType> host_proxy; - receiver->Bind(mojo::MakeRequest(&host_proxy)); + mojo::PendingRemote<HostType> host_proxy; + receiver->Bind(host_proxy.InitWithNewPipeAndPassReceiver()); instance_->Init( std::move(host_proxy), base::BindOnce(&ConnectionHolderImpl::OnConnectionReady, |