Add creation of ServiceManager to Content (2nd try)

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 976 matching lines @@
             '..',
             '<(SHARED_INTERMEDIATE_DIR)',  # Needed by encrypted_media_browsertest.cc
           ],
           'includes': [
             'browser/gpu/test_support_gpu.gypi',
           ],
           'defines': [
             'HAS_OUT_OF_PROC_TEST_RUNNER',
           ],
           'sources': [
+            'app/mojo/mojo_browsertest.cc',
             'browser/accessibility/accessibility_win_browsertest.cc',
             'browser/accessibility/cross_platform_accessibility_browsertest.cc',
             'browser/accessibility/dump_accessibility_tree_browsertest.cc',
             'browser/compositor/image_transport_factory_browsertest.cc',
             'browser/bookmarklet_browsertest.cc',
             'browser/browser_plugin/browser_plugin_host_browsertest.cc',
             'browser/browser_plugin/test_browser_plugin_guest.cc',
             'browser/browser_plugin/test_browser_plugin_guest.h',
             'browser/browser_plugin/test_browser_plugin_guest_delegate.cc',
             'browser/browser_plugin/test_browser_plugin_guest_delegate.h',
@@ skipping 171 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'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }