Reland of Mojo: Eliminate duplicate C API symbols

mojo/edk/embedder/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/embedder.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/edk/embedder/embedder_internal.h"
+#include "mojo/edk/embedder/entrypoints.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/edk/system/core.h"
 
 #if !defined(OS_NACL)
 #include "crypto/random.h"
 #endif
 
 namespace mojo {
 namespace edk {
@@ skipping 33 matching lines @@
 
 void SetParentPipeHandleFromCommandLine() {
   ScopedPlatformHandle platform_channel =
       PlatformChannelPair::PassClientHandleFromParentProcess(
           *base::CommandLine::ForCurrentProcess());
   CHECK(platform_channel.is_valid());
   SetParentPipeHandle(std::move(platform_channel));
 }
 
 void Init() {
+  MojoSystemThunks thunks = MakeSystemThunks();
+  size_t expected_size = MojoEmbedderSetSystemThunks(&thunks);
+  DCHECK_EQ(expected_size, sizeof(thunks));
+
   internal::g_core = new Core();
 }
 
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
                      const base::Callback<void(MojoResult)>& callback) {
   CHECK(internal::g_core);
   return internal::g_core->AsyncWait(handle, signals, callback);
 }
 
@@ skipping 73 matching lines @@
   // Not secure. For NaCl only!
   base::RandBytes(random_bytes, 16);
 #else
   crypto::RandBytes(random_bytes, 16);
 #endif
   return base::HexEncode(random_bytes, 16);
 }
 
 }  // namespace edk
 }  // namespace mojo