Reland of Mojo: Eliminate duplicate C API symbols

services/shell/runner/host/native_application_support.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 "services/shell/runner/host/native_application_support.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #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 {
 
 namespace {
 
 template <typename Thunks>
 bool SetThunks(Thunks (*make_thunks)(),
                const char* function_name,
                base::NativeLibrary library) {
   typedef size_t (*SetThunksFn)(const Thunks* thunks);
@@ skipping 25 matching lines @@
 
 bool RunNativeApplication(base::NativeLibrary app_library,
                           mojom::ShellClientRequest request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
 
 // 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;
   }
 
 #if !defined(OS_WIN)
   // On Windows, initializing base::CommandLine with null parameters gets the
   // process's command line from the OS. Other platforms need it to be passed
   // in. This needs to be passed in before the app initializes the command line,
   // which is done as soon as it loads.
   typedef void (*InitCommandLineArgs)(int, const char* const*);
@@ skipping 23 matching lines @@
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result != MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
   }
   return true;
 }
 
 }  // namespace shell