From 1fbb4c67fc1c3977727873f4280b66a7d2c98f15 Mon Sep 17 00:00:00 2001
From: benwells <benwells@chromium.org>
Date: Mon, 26 Jan 2015 19:14:45 -0800
Subject: 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}
---
 ppapi/tests/test_view.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ppapi/tests/test_view.cc')

diff --git a/ppapi/tests/test_view.cc b/ppapi/tests/test_view.cc
index 5ce903a..df51199e 100644
--- a/ppapi/tests/test_view.cc
+++ b/ppapi/tests/test_view.cc
@@ -14,7 +14,7 @@
 REGISTER_TEST_CASE(View);
 
 // When waiting for view changed events, wait no longer than this.
-#if !defined(THREAD_SANITIZER)
+#if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER)
 static int kViewChangeTimeoutSec = 5;
 #else
 // ThreadSanitizer may slow the interaction down significantly.
-- 
cgit v1.1