Revert of Test that visual state callbacks do not deadlock.

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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 236 matching lines @@
       'child/site_isolation_policy_browsertest.cc',
       'child/child_discardable_shared_memory_manager_browsertest.cc',
       'renderer/accessibility/renderer_accessibility_browsertest.cc',
       'renderer/devtools/v8_sampling_profiler_browsertest.cc',
       'renderer/gin_browsertest.cc',
       'renderer/mouse_lock_dispatcher_browsertest.cc',
       'renderer/render_thread_impl_browsertest.cc',
       'renderer/render_view_browsertest.cc',
       'renderer/render_view_browsertest_mac.mm',
       'renderer/render_widget_browsertest.cc',
-      'renderer/visual_state_browsertest.cc',
       'test/accessibility_browser_test_utils.cc',
       'test/accessibility_browser_test_utils.h',
       'test/browser_test_utils_browsertest.cc',
       'test/content_browser_test_test.cc',
       'test/webui_resource_browsertest.cc',
 
     ],
     'content_browsertests_android_sources': [
       'browser/accessibility/android_granularity_movement_browsertest.cc',
       'browser/accessibility/android_hit_testing_browsertest.cc',
@@ skipping 1318 matching lines @@
                   ['exclude', '^common/gpu/media/rendering_helper.h'],
                   ['exclude', '^common/gpu/media/rendering_helper.cc'],
                   ['exclude', '^common/gpu/media/video_decode_accelerator_unittest.cc'],
                 ],
                 'dependencies': [
                   '../media/media.gyp:player_android',
                   '../testing/gmock.gyp:gmock',
                   '../testing/android/native_test.gyp:native_test_native_code',
                   '../gpu/gpu.gyp:gpu_unittest_utils',
                 ],
-              }, {  # OS!="android"
+              }, { # OS!="android"
                 'sources/': [
                   ['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
                 ],
               }],
               ['OS=="win"', {
                 'dependencies': [
                   '<(angle_path)/src/angle.gyp:libEGL',
                   '<(angle_path)/src/angle.gyp:libGLESv2',
                 ],
               }],
@@ skipping 10 matching lines @@
                 ],
               }],
               ['use_x11==1', {
                 'dependencies': [
                   '../build/linux/system.gyp:x11',  # Used by rendering_helper.cc
                   '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
                 ],
               }],
               ['use_ozone==1 and chromeos==1', {
                 'dependencies': [
-                  '../ui/display/display.gyp:display',  # Used by rendering_helper.cc
-                  '../ui/ozone/ozone.gyp:ozone',  # Used by rendering_helper.cc
+                  '../ui/display/display.gyp:display', # Used by rendering_helper.cc
+                  '../ui/ozone/ozone.gyp:ozone',       # Used by rendering_helper.cc
                 ],
               }],
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [ 4267, ],
           },
         ]
     }],
     ['chromeos==1 and target_arch != "arm"', {
       'targets': [
@@ skipping 350 matching lines @@
             '../media/media.gyp:media_test_support',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../net/net.gyp:net_java_test_support',
             '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',
             'java_in_dir': 'shell/android/javatests',
             'resource_dir': 'shell/android/shell_apk/res',
-            'additional_src_dirs': ['public/android/javatests/', ],
+            'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
     ['OS!="android" and OS!="ios" and OS!="linux"', {
       # npapi test plugin doesn't build on android or ios
       'targets': [
         {
@@ skipping 132 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }