Revert 257505 "Adds the ability for the renderer to create the m..."

trunk/src/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',
     '../components/tracing.gyp:tracing',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
@@ skipping 311 matching lines @@
     'common/media/media_stream_track_metrics_host_messages.h',
     'common/media/midi_messages.h',
     'common/media/video_capture.h',
     'common/media/video_capture_messages.h',
     'common/media/webrtc_identity_messages.h',
     'common/memory_benchmark_messages.h',
     'common/message_port_messages.h',
     'common/message_router.cc',
     'common/message_router.h',
     'common/mime_registry_messages.h',
-    'common/mojo/mojo_channel_init.cc',
-    'common/mojo/mojo_channel_init.h',
-    'common/mojo/mojo_messages.h',
     'common/navigation_gesture.h',
     'common/net/url_fetcher.cc',
     'common/net/url_request_user_data.cc',
     'common/net/url_request_user_data.h',
     'common/one_writer_seqlock.cc',
     'common/one_writer_seqlock.h',
     'common/p2p_messages.h',
     'common/page_state_serialization.cc',
     'common/page_state_serialization.h',
     'common/page_zoom.cc',
@@ skipping 135 matching lines @@
         '../media/media.gyp:shared_memory_support',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
         'content.gyp:webkit_version',
       ],
     }],
-    # Work around for bug in linker used on ia32 machines (gold is not used on
-    # ia32 machines). See bug 353273.
-    ['OS=="linux" and target_arch=="ia32" and component=="static_library"', {
-      'link_settings': {
-        'libraries': [
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
-        ],
-      },
-    }],
-    # TODO(sky): conditional temporary until mojo is sorted out on mac.
-    ['OS=="mac" or OS=="ios"', {
-      'sources!': [
-        'common/mojo/mojo_channel_init.cc',
-        'common/mojo/mojo_channel_init.h',
-      ],
-    }, {
-      'dependencies': [
-        '../mojo/mojo.gyp:mojo_environment_chromium',
-        '../mojo/mojo.gyp:mojo_system',
-        '../mojo/mojo.gyp:mojo_system_impl',
-      ],
-    }],
     ['OS=="mac"', {
       'sources': [
         'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
         'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',
       ],
       'sources!': [
         'common/plugin_list_posix.cc',
       ],
       'link_settings': {
         'libraries': [
@@ skipping 213 matching lines @@
         'common/sandbox_linux/bpf_renderer_policy_linux.cc',
         'common/sandbox_linux/bpf_renderer_policy_linux.h',
         'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
         'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
       ],
     }, {
       'defines': ['USE_SECCOMP_BPF'],
     }],
   ],
 }