Make the embedder API use the ChannelManager.

mojo/edk/embedder/test_embedder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/embedder/test_embedder.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #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 internal {
 
 bool ShutdownCheckNoLeaks(Core* core) {
   // No point in taking the lock.
@@ skipping 15 matching lines @@
 }  // namespace system
 
 namespace embedder {
 namespace test {
 
 void InitWithSimplePlatformSupport() {
   Init(make_scoped_ptr(new SimplePlatformSupport()));
 }
 
 bool Shutdown() {
-  system::Core* core = internal::g_core;
-  CHECK(core);
+  CHECK(internal::g_channel_manager);
+  delete internal::g_channel_manager;
+  internal::g_channel_manager = nullptr;
+
+  CHECK(internal::g_core);
+  bool rv = system::internal::ShutdownCheckNoLeaks(internal::g_core);
+  delete internal::g_core;
   internal::g_core = nullptr;
-
-  bool rv = system::internal::ShutdownCheckNoLeaks(core);
-  delete core;
   return rv;
 }
 
 }  // namespace test
 }  // namespace embedder
 
 }  // namespace mojo