Index: mojo/edk/embedder/test_embedder.cc |
diff --git a/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc b/mojo/edk/embedder/test_embedder.cc |
similarity index 55% |
copy from third_party/mojo/src/mojo/edk/embedder/test_embedder.cc |
copy to mojo/edk/embedder/test_embedder.cc |
index bb99819a40ca9a6dccad25ba9d964856a9224425..b33ea7be2c72c2e0d698aaffd2512731cd36daf9 100644 |
--- a/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc |
+++ b/mojo/edk/embedder/test_embedder.cc |
@@ -2,20 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" |
+#include "mojo/edk/embedder/test_embedder.h" |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/embedder_internal.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" |
-#include "third_party/mojo/src/mojo/edk/system/channel_manager.h" |
-#include "third_party/mojo/src/mojo/edk/system/core.h" |
-#include "third_party/mojo/src/mojo/edk/system/handle_table.h" |
+#include "mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/embedder/embedder_internal.h" |
+#include "mojo/edk/embedder/platform_support.h" |
+#include "mojo/edk/system/core.h" |
+#include "mojo/edk/system/handle_table.h" |
namespace mojo { |
-namespace system { |
+namespace edk { |
namespace internal { |
bool ShutdownCheckNoLeaks(Core* core) { |
@@ -35,22 +34,12 @@ bool ShutdownCheckNoLeaks(Core* core) { |
} |
} // namespace internal |
-} // namespace system |
-namespace embedder { |
namespace test { |
-void InitWithSimplePlatformSupport() { |
- Init(make_scoped_ptr(new SimplePlatformSupport())); |
-} |
- |
bool Shutdown() { |
- // If |InitIPCSupport()| was called, then |ShutdownIPCSupport()| must have |
- // been called first. |
- CHECK(!internal::g_ipc_support); |
- |
CHECK(internal::g_core); |
- bool rv = system::internal::ShutdownCheckNoLeaks(internal::g_core); |
+ bool rv = internal::ShutdownCheckNoLeaks(internal::g_core); |
delete internal::g_core; |
internal::g_core = nullptr; |
@@ -62,6 +51,6 @@ bool Shutdown() { |
} |
} // namespace test |
-} // namespace embedder |
+} // namespace edk |
} // namespace mojo |