| Index: content/child/child_thread_impl.h
|
| diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h
|
| index 002f753e1a10c81f161f026e359acadaa6410903..7429963603d0e7cff3074bbe29ea70ce5414c3ab 100644
|
| --- a/content/child/child_thread_impl.h
|
| +++ b/content/child/child_thread_impl.h
|
| @@ -31,11 +31,16 @@ class MessageLoop;
|
|
|
| namespace IPC {
|
| class MessageFilter;
|
| -class ScopedIPCSupport;
|
| class SyncChannel;
|
| class SyncMessageFilter;
|
| } // namespace IPC
|
|
|
| +namespace mojo {
|
| +namespace edk {
|
| +class ScopedIPCSupport;
|
| +} // namespace edk
|
| +} // namespace mojo
|
| +
|
| namespace blink {
|
| class WebFrame;
|
| } // namespace blink
|
| @@ -243,7 +248,7 @@ class CONTENT_EXPORT ChildThreadImpl
|
|
|
| void EnsureConnected();
|
|
|
| - std::unique_ptr<IPC::ScopedIPCSupport> mojo_ipc_support_;
|
| + std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
|
| std::unique_ptr<MojoApplication> mojo_application_;
|
|
|
| std::string channel_name_;
|
|
|