Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480

mojo/edk/embedder/test_embedder.cc

Index: mojo/edk/embedder/test_embedder.cc
diff --git a/mojo/edk/embedder/test_embedder.cc b/mojo/edk/embedder/test_embedder.cc
index 1eca9c8269a152e5c63a83489b93a3d3467e0abe..95d3be6cdc888a43c83ca9a8843881d63b3d6d0c 100644
--- a/mojo/edk/embedder/test_embedder.cc
+++ b/mojo/edk/embedder/test_embedder.cc
@@ -8,9 +8,9 @@
 #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/core.h"
+#include "mojo/edk/system/entrypoints.h"
 #include "mojo/edk/system/handle_table.h"
 
 namespace mojo {
@@ -18,17 +18,18 @@
 namespace system {
 namespace internal {
 
-bool ShutdownCheckNoLeaks(Core* core) {
+bool ShutdownCheckNoLeaks(Core* core_impl) {
   // No point in taking the lock.
   const HandleTable::HandleToEntryMap& handle_to_entry_map =
-      core->handle_table_.handle_to_entry_map_;
+      core_impl->handle_table_.handle_to_entry_map_;
 
   if (handle_to_entry_map.empty())
     return true;
 
   for (HandleTable::HandleToEntryMap::const_iterator it =
            handle_to_entry_map.begin();
-       it != handle_to_entry_map.end(); ++it) {
+       it != handle_to_entry_map.end();
+       ++it) {
     LOG(ERROR) << "Mojo embedder shutdown: Leaking handle " << (*it).first;
   }
   return false;
@@ -45,9 +46,9 @@
 }
 
 bool Shutdown() {
-  system::Core* core = internal::g_core;
+  system::Core* core = system::entrypoints::GetCore();
   CHECK(core);
-  internal::g_core = nullptr;
+  system::entrypoints::SetCore(nullptr);
 
   bool rv = system::internal::ShutdownCheckNoLeaks(core);
   delete core;