Revert "Use a token to initialise ChannelMojo and MojoApplication everywhere."

content/content_common.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../cc/cc.gyp:cc',
     '../components/tracing.gyp:tracing',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
@@ skipping 443 matching lines @@
       'common/media/media_stream_options.h',
       'common/media/media_stream_track_metrics_host_messages.h',
       'common/media/midi_messages.h',
       'common/media/surface_view_manager_messages_android.h',
       'common/media/video_capture.h',
       'common/media/video_capture_messages.h',
       'common/media/webrtc_identity_messages.h',
       'common/memory_messages.h',
       'common/message_port_messages.h',
       'common/mime_registry_messages.h',
+      'common/mojo/channel_init.cc',
+      'common/mojo/channel_init.h',
       'common/mojo/embedded_application_runner.cc',
       'common/mojo/embedded_application_runner.h',
+      'common/mojo/mojo_messages.h',
       'common/mojo/mojo_shell_connection_impl.cc',
       'common/mojo/mojo_shell_connection_impl.h',
       'common/mojo/service_registry_impl.cc',
       'common/mojo/service_registry_impl.h',
       'common/mojo/static_loader.cc',
       'common/mojo/static_loader.h',
       'common/navigation_gesture.h',
       'common/navigation_params.cc',
       'common/navigation_params.h',
       'common/net/url_fetcher.cc',
@@ skipping 520 matching lines @@
       'sources!': [
         'common/cursors/webcursor_ozone.cc',
         'common/font_list_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
       ],
     }],
   ],
 }