Reland of Mojo: Eliminate duplicate C API symbols

services/shell/runner/host/native_application_support.cc

Index: services/shell/runner/host/native_application_support.cc
diff --git a/services/shell/runner/host/native_application_support.cc b/services/shell/runner/host/native_application_support.cc
index 945176ba651d8f19fa7beed85ab62627c8dd8356..c06ecd0a35b47b2e3c64445bc5194866814141a6 100644
--- a/services/shell/runner/host/native_application_support.cc
+++ b/services/shell/runner/host/native_application_support.cc
@@ -10,7 +10,8 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "mojo/public/platform/native/system_thunks.h"
+#include "mojo/edk/embedder/entrypoints.h"
+#include "mojo/public/c/system/thunks.h"
 
 namespace shell {
 
@@ -56,7 +57,8 @@
 // Thunks aren't needed/used in component build, since the thunked methods
 // just live in their own dynamically loaded library.
 #if !defined(COMPONENT_BUILD)
-  if (!SetThunks(&MojoMakeSystemThunks, "MojoSetSystemThunks", app_library)) {
+  if (!SetThunks(&mojo::edk::MakeSystemThunks, "MojoSetSystemThunks",
+                 app_library)) {
     LOG(ERROR) << "MojoSetSystemThunks not found";
     return false;
   }