[mojo] Ports EDK

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/memory/scoped_ptr.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/broker.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/handle_table.h"
 
 namespace mojo {
 
 namespace edk {
 namespace internal {
 
 bool ShutdownCheckNoLeaks(Core* core) {
-  // No point in taking the lock.
-  const HandleTable::HandleToEntryMap& handle_to_entry_map =
-      core->handle_table_.handle_to_entry_map_;
-
-  if (handle_to_entry_map.empty())
+  std::vector<MojoHandle> leaked_handles;
+  core->GetActiveHandlesForTest(&leaked_handles);
+  if (leaked_handles.empty())
     return true;
-
-  for (HandleTable::HandleToEntryMap::const_iterator it =
-           handle_to_entry_map.begin();
-       it != handle_to_entry_map.end(); ++it) {
-    LOG(ERROR) << "Mojo embedder shutdown: Leaking handle " << (*it).first;
-  }
+  for (auto handle : leaked_handles)
+    LOG(ERROR) << "Mojo embedder shutdown: Leaking handle " << handle;
   return false;
 }
 
 }  // namespace internal
 
 namespace test {
 
 bool Shutdown() {
   CHECK(internal::g_core);
   bool rv = internal::ShutdownCheckNoLeaks(internal::g_core);
   delete internal::g_core;
   internal::g_core = nullptr;
 
   CHECK(internal::g_platform_support);
   delete internal::g_platform_support;
   internal::g_platform_support = nullptr;
 
-  CHECK(internal::g_broker);
-  delete internal::g_broker;
-  internal::g_broker = nullptr;
-
   return rv;
 }
 
 }  // namespace test
 }  // namespace edk
 
 }  // namespace mojo