diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 06:44:34 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 06:44:34 +0000 |
| commit | 84798a52581f50494655274113381278c498c38a (patch) | |
| tree | d766fc657fbdf384ce278a8807a9ae8a29d35e3f /media | |
| parent | b4207c4a04f7e7cea2a93446786d443a5ec19bd3 (diff) | |
| download | chromium_src-84798a52581f50494655274113381278c498c38a.zip chromium_src-84798a52581f50494655274113381278c498c38a.tar.gz chromium_src-84798a52581f50494655274113381278c498c38a.tar.bz2 | |
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/screen/screen_capturer_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
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())); |