| Index: content/browser/mojo/mojo_application_host.h
|
| diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
|
| index 82dcb6423b0fc960e0986646dbf1836a2c3f5790..8c8449d35274cbef872fc6f5c1183055f0e1a49c 100644
|
| --- a/content/browser/mojo/mojo_application_host.h
|
| +++ b/content/browser/mojo/mojo_application_host.h
|
| @@ -13,8 +13,8 @@
|
| #include "content/common/application_setup.mojom.h"
|
| #include "content/common/mojo/channel_init.h"
|
| #include "content/common/mojo/service_registry_impl.h"
|
| +#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| #include "mojo/public/cpp/system/message_pipe.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "content/browser/mojo/service_registry_android.h"
|
| @@ -42,8 +42,6 @@ class CONTENT_EXPORT MojoApplicationHost {
|
| bool Init();
|
| void Activate(IPC::Sender* sender, base::ProcessHandle process_handle);
|
|
|
| - void WillDestroySoon();
|
| -
|
| ServiceRegistry* service_registry() { return &service_registry_; }
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -59,7 +57,7 @@ class CONTENT_EXPORT MojoApplicationHost {
|
| void OnMessagePipeCreated(mojo::ScopedMessagePipeHandle pipe);
|
|
|
| ChannelInit channel_init_;
|
| - mojo::embedder::ScopedPlatformHandle client_handle_;
|
| + mojo::edk::ScopedPlatformHandle client_handle_;
|
|
|
| bool did_activate_;
|
|
|
|
|