| Index: third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
|
| index 664c8dd80f659d8f47426551596a93bde76d6687..72b34655ed97fb22067d637674bf57643ccb9404 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
|
| +++ b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
|
| @@ -2,20 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
|
| -#define MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
|
| +#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
|
| +#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| -#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| -#include "mojo/edk/embedder/slave_process_delegate.h"
|
| -#include "mojo/edk/system/connection_manager.h"
|
| -#include "mojo/edk/system/mutex.h"
|
| -#include "mojo/edk/system/raw_channel.h"
|
| -#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
|
| +#include "third_party/mojo/src/mojo/edk/embedder/slave_process_delegate.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/connection_manager.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/mutex.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/raw_channel.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace base {
|
| class TaskRunner;
|
| @@ -155,4 +155,4 @@ class MOJO_SYSTEM_IMPL_EXPORT SlaveConnectionManager final
|
| } // namespace system
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
|
| +#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
|
|
|