Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Revert of Test that visual state callbacks do not deadlock. (patchset #6
Browse files Browse the repository at this point in the history
 id:100001 of https://codereview.chromium.org/939673002/)

Reason for revert:
Timing out on Blink waterfall. See https://code.google.com/p/chromium/issues/detail?id=458577#c10 .

Original issue's description:
> Test that visual state callbacks do not deadlock.
>
> Visual state callbacks should always be received,
> even if there are no pending commits. We add
> a test for that. See crbug/458577 for more details.
>
> BUG=458577
>
> Committed: https://crrev.com/dcc18cb569b31bc07c97d49573e695ec8b1f80c0
> Cr-Commit-Position: refs/heads/master@{#317306}

[email protected],[email protected],[email protected],[email protected]
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=458577

Review URL: https://codereview.chromium.org/942973002

Cr-Commit-Position: refs/heads/master@{#317381}
  • Loading branch information
kenrussell authored and Commit bot committed Feb 20, 2015
1 parent 76ec1ea commit 5b56970
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 115 deletions.
9 changes: 4 additions & 5 deletions content/content_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@
'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',
Expand Down Expand Up @@ -1593,7 +1592,7 @@
'../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'],
],
Expand Down Expand Up @@ -1624,8 +1623,8 @@
}],
['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
],
}],
],
Expand Down Expand Up @@ -1996,7 +1995,7 @@
'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' ],
Expand Down
110 changes: 0 additions & 110 deletions content/renderer/visual_state_browsertest.cc

This file was deleted.

0 comments on commit 5b56970

Please sign in to comment.