Removes use_mojo

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 906 matching lines @@
           ],
           'sources': [
             'test/content_test_launcher.cc',
             'public/test/content_browser_test.cc',
             'public/test/content_browser_test.h',
             'public/test/content_browser_test_utils.cc',
             'public/test/content_browser_test_utils.h',
             'public/test/content_browser_test_utils_mac.mm',
           ],
           'conditions': [
-            ['use_mojo==1 and OS=="android"', {
+            ['OS=="android"', {
               'dependencies': [
                 'content.gyp:content_app_both',
               ],
             }, {
               'dependencies': [
                 'content.gyp:content_browser',
               ],
             }],
           ],
         },
@@ skipping 23 matching lines @@
           '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',
             'content_shell_pak',
+            'web_ui_test_mojo_bindings',
             '../base/base.gyp:test_support_base',
             '../gin/gin.gyp:gin',
             '../gpu/gpu.gyp:gpu',
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
+            '../mojo/mojo.gyp:mojo_bindings',
+            '../mojo/mojo.gyp:mojo_environment_chromium',
+            '../mojo/mojo.gyp:mojo_service_manager',
+            '../mojo/mojo.gyp:mojo_system',
+            '../mojo/mojo.gyp:mojo_system_impl',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ skipping 108 matching lines @@
             'test/accessibility_browser_test_utils.h',
             'test/content_browser_test_test.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 67 matching lines @@
             ['use_aura==1 or toolkit_views==1', {
               'dependencies': [
                 '../ui/events/events.gyp:events_test_support',
               ],
             }],
             ['use_aura!=1 and OS!="mac"', {
               'sources/': [
                 ['exclude', '^browser/compositor/'],
               ],
             }],
-            ['use_mojo==1', {
-              'dependencies': [
-                '../mojo/mojo.gyp:mojo_environment_chromium',
-                '../mojo/mojo.gyp:mojo_service_manager',
-              ],
-            },{
-              'sources!': [
-                'app/mojo/mojo_browsertest.cc',
-              ],
-            }],
             ['OS!="android" and OS!="ios"', {
               # npapi test plugin doesn't build on android or ios
               'dependencies': [
                 # Runtime dependencies
                 'copy_npapi_test_plugin',
               ],
             }],
             ['enable_webrtc==1', {
               'sources': [
                 'browser/media/webrtc_aecdump_browsertest.cc',
@@ skipping 560 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }