Skip to content

Commit

Permalink
Re-enable ScreenCapturer.Capture test under TSan v2.
Browse files Browse the repository at this point in the history
The test has moved since the issue was reported, and only repro'd if the
full remoting test-suite was run, suggesting that some other test is at
fault.

BUG=167260


Review URL: https://chromiumcodereview.appspot.com/12223066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181888 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
wez@chromium.org committed Feb 12, 2013
1 parent b4207c4 commit 84798a5
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions media/video/capture/screen/screen_capturer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,7 @@ TEST_F(ScreenCapturerTest, StartCapturer) {
capturer_->Stop();
}

#if defined(THREAD_SANITIZER)
// ThreadSanitizer v2 reports a use-after-free, see http://crbug.com/163641.
#define MAYBE_Capture DISABLED_Capture
#else
#define MAYBE_Capture Capture
#endif
TEST_F(ScreenCapturerTest, MAYBE_Capture) {
TEST_F(ScreenCapturerTest, Capture) {
// Assume that Start() treats the screen as invalid initially.
EXPECT_CALL(delegate_,
OnCaptureCompleted(DirtyRegionIsNonEmptyRect()));
Expand Down

0 comments on commit 84798a5

Please sign in to comment.