diff options
| author | benwells <benwells@chromium.org> | 2015-01-26 19:14:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-27 03:15:27 +0000 |
| commit | 1fbb4c67fc1c3977727873f4280b66a7d2c98f15 (patch) | |
| tree | ba28a92c6655185a33c653e709198aaa4fe302ba /chrome/test/ppapi | |
| parent | ac0afb8657e49b1f792bd19d6f0acf805c28f49a (diff) | |
| download | chromium_src-1fbb4c67fc1c3977727873f4280b66a7d2c98f15.zip chromium_src-1fbb4c67fc1c3977727873f4280b66a7d2c98f15.tar.gz chromium_src-1fbb4c67fc1c3977727873f4280b66a7d2c98f15.tar.bz2 | |
Increase timeout of PPAPI*.View tests and reenable on MSAN.
BUG=450908
Review URL: https://codereview.chromium.org/869863002
Cr-Commit-Position: refs/heads/master@{#313217}
Diffstat (limited to 'chrome/test/ppapi')
| -rw-r--r-- | chrome/test/ppapi/ppapi_browsertest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index a2e3912..ec257f65 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -1304,13 +1304,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) { IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { RUN_VIEW_SUBTESTS; } -// Disabled due to flakiness under MSAN. See http://crbug.com/450908. -#if defined(MEMORY_SANITIZER) -#define MAYBE_View DISABLED_View -#else -#define MAYBE_View View -#endif -IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(MAYBE_View)) { +IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(View)) { RUN_VIEW_SUBTESTS; } IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) { |