| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 8656442e450e711ed38a0de821157bd1c17c05cb..73ff7656b47759cf8f416242abddb44fe5337b8b 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -76,11 +76,11 @@
|
| #include "content/public/common/main_function_params.h"
|
| #include "content/public/common/result_codes.h"
|
| #include "device/battery/battery_status_service.h"
|
| -#include "ipc/mojo/scoped_ipc_support.h"
|
| #include "media/base/media.h"
|
| #include "media/base/user_input_monitor.h"
|
| #include "media/midi/midi_manager.h"
|
| #include "mojo/edk/embedder/embedder.h"
|
| +#include "mojo/edk/embedder/scoped_ipc_support.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/socket/client_socket_factory.h"
|
| #include "net/ssl/ssl_config_service.h"
|
| @@ -1153,7 +1153,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted");
|
|
|
| // Bring up Mojo IPC and shell as early as possible.
|
| - mojo_ipc_support_.reset(new IPC::ScopedIPCSupport(
|
| + mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport(
|
| BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
|
| ->task_runner()));
|
|
|
|
|