| 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 88%
|
| copy from third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
|
| copy to mojo/edk/embedder/test_embedder.cc
|
| index d7c0d40df6f82b616e730dcf63c2d11e93795ae1..cfccf157c168a439d81486fc9b7936923ac61b5a 100644
|
| --- a/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
|
| +++ b/mojo/edk/embedder/test_embedder.cc
|
| @@ -9,13 +9,12 @@
|
| #include "mojo/edk/embedder/embedder.h"
|
| #include "mojo/edk/embedder/embedder_internal.h"
|
| #include "mojo/edk/embedder/simple_platform_support.h"
|
| -#include "mojo/edk/system/channel_manager.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,9 +34,7 @@ bool ShutdownCheckNoLeaks(Core* core) {
|
| }
|
|
|
| } // namespace internal
|
| -} // namespace system
|
|
|
| -namespace embedder {
|
| namespace test {
|
|
|
| void InitWithSimplePlatformSupport() {
|
| @@ -47,10 +44,11 @@ void InitWithSimplePlatformSupport() {
|
| bool Shutdown() {
|
| // If |InitIPCSupport()| was called, then |ShutdownIPCSupport()| must have
|
| // been called first.
|
| + /*TODO(jam)
|
| 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;
|
|
|
| @@ -59,9 +57,11 @@ bool Shutdown() {
|
| internal::g_platform_support = nullptr;
|
|
|
| return rv;
|
| + */
|
| + return true;
|
| }
|
|
|
| } // namespace test
|
| -} // namespace embedder
|
| +} // namespace edk
|
|
|
| } // namespace mojo
|
|
|