Revert 258763 "Adds plumbing to pass WebUI mojo::Handle from bro..."

trunk/src/content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
@@ skipping 903 matching lines @@
             'test/accessibility_browser_test_utils.cc',
             'test/accessibility_browser_test_utils.h',
             'test/content_browser_test.cc',
             'test/content_browser_test.h',
             'test/content_browser_test_utils.cc',
             'test/content_browser_test_utils.h',
             'test/content_browser_test_utils_mac.mm',
           ],
         },
         {
-          'target_name': 'web_ui_test_mojo_bindings',
-          'type': 'static_library',
-          'dependencies': [
-            '../mojo/mojo.gyp:mojo_bindings',
-            '../mojo/mojo.gyp:mojo_system',
-          ],
-          'sources': [
-            'test/data/web_ui_test_mojo_bindings.mojom',
-          ],
-          'includes': [ '../mojo/public/bindings/mojom_bindings_generator.gypi' ],
-          'export_dependent_settings': [
-            '../mojo/mojo.gyp:mojo_bindings',
-            '../mojo/mojo.gyp:mojo_system',
-          ],
-        },
-        {
           'target_name': 'content_browsertests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             'content.gyp:content_common',
             'content.gyp:content_gpu',
             'content.gyp:content_plugin',
             'content.gyp:content_renderer',
             'content_browser_test_support',
             'content_resources.gyp:content_resources',
             'content_shell_lib',
@@ skipping 84 matching lines @@
             'browser/service_worker/service_worker_browsertest.cc',
             'browser/session_history_browsertest.cc',
             'browser/site_per_process_browsertest.cc',
             'browser/speech/input_tag_speech_browsertest.cc',
             'browser/speech/speech_recognition_browsertest.cc',
             'browser/tracing/tracing_controller_browsertest.cc',
             'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
             'browser/web_contents/web_contents_impl_browsertest.cc',
             'browser/web_contents/web_contents_view_aura_browsertest.cc',
             'browser/webkit_browsertest.cc',
-            'browser/webui/web_ui_mojo_browsertest.cc',
             'browser/worker_host/test/worker_browsertest.cc',
             'child/site_isolation_policy_browsertest.cc',
             'common/gpu/client/context_provider_command_buffer_browsertest.cc',
             'renderer/accessibility/renderer_accessibility_browsertest.cc',
             'renderer/browser_plugin/browser_plugin_browsertest.cc',
             'renderer/browser_plugin/browser_plugin_browsertest.h',
             'renderer/browser_plugin/mock_browser_plugin.cc',
             'renderer/browser_plugin/mock_browser_plugin.h',
             'renderer/browser_plugin/mock_browser_plugin_manager.cc',
             'renderer/browser_plugin/mock_browser_plugin_manager.h',
@@ skipping 16 matching lines @@
             'test/content_browser_test_test.cc',
             'test/content_test_launcher.cc',
             'test/webui_resource_browsertest.cc',
           ],
           'conditions': [
             ['chromeos==0', {
               'sources!': [
                 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
               ],
             }],
-            ['use_mojo==0', {
-              'sources!': [
-                'browser/webui/web_ui_mojo_browsertest.cc',
-              ],
-            }, {  # use_mojo==1
-              'dependencies': [
-                'web_ui_test_mojo_bindings',
-                '../mojo/mojo.gyp:mojo_bindings',
-                '../mojo/mojo.gyp:mojo_environment_chromium',
-                '../mojo/mojo.gyp:mojo_system',
-                '../mojo/mojo.gyp:mojo_system_impl',
-              ],
-            }],
             ['OS=="win"', {
               'resource_include_dirs': [
                 '<(SHARED_INTERMEDIATE_DIR)/webkit',
               ],
               'sources': [
                 'shell/app/resource.h',
                 'shell/app/shell.rc',
                 # TODO:  It would be nice to have these pulled in
                 # automatically from direct_dependent_settings in
                 # their various targets (net.gyp:net_resources, etc.),
@@ skipping 647 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }