From 84798a52581f50494655274113381278c498c38a Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Tue, 12 Feb 2013 06:44:34 +0000 Subject: Re-enable ScreenCapturer.Capture test under TSan v2. 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 --- media/video/capture/screen/screen_capturer_unittest.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'media/video') diff --git a/media/video/capture/screen/screen_capturer_unittest.cc b/media/video/capture/screen/screen_capturer_unittest.cc index b135ed0..7d9ab95 100644 --- a/media/video/capture/screen/screen_capturer_unittest.cc +++ b/media/video/capture/screen/screen_capturer_unittest.cc @@ -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())); -- cgit v1.1