Revert of Making the Mojo Channel Messages legacy mode dynamic.

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 <utility>
 
 #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/system/channel.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/node_controller.h"
 
 #if !defined(OS_NACL)
 #include "crypto/random.h"
 #endif
 
 namespace mojo {
 namespace edk {
 
@@ skipping 36 matching lines @@
 }
 
 void ClosePeerConnection(const std::string& peer_token) {
   return internal::g_core->ClosePeerConnection(peer_token);
 }
 
 void Init() {
   MojoSystemThunks thunks = MakeSystemThunks();
   size_t expected_size = MojoEmbedderSetSystemThunks(&thunks);
   DCHECK_EQ(expected_size, sizeof(thunks));
-#if defined(MOJO_EDK_LEGACY_PROTOCOL)
-  SetUseLegacyTransportProtocol(true);
-#endif
+
   internal::g_core = new Core();
 }
 
 void SetDefaultProcessErrorCallback(const ProcessErrorCallback& callback) {
   internal::g_core->SetDefaultProcessErrorCallback(callback);
 }
 
-void SetUseLegacyTransportProtocol(bool use_legacy_protocol) {
-  Channel::Message::SetUseLegacyTransportProtocol(use_legacy_protocol);
-}
-
 MojoResult CreatePlatformHandleWrapper(
     ScopedPlatformHandle platform_handle,
     MojoHandle* platform_handle_wrapper_handle) {
   return internal::g_core->CreatePlatformHandleWrapper(
       std::move(platform_handle), platform_handle_wrapper_handle);
 }
 
 MojoResult PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle,
                                      ScopedPlatformHandle* platform_handle) {
   return internal::g_core->PassWrappedPlatformHandle(
@@ skipping 54 matching lines @@
   return base::HexEncode(random_bytes, 16);
 }
 
 MojoResult SetProperty(MojoPropertyType type, const void* value) {
   CHECK(internal::g_core);
   return internal::g_core->SetProperty(type, value);
 }
 
 }  // namespace edk
 }  // namespace mojo