Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / base / test / test_timeouts.cc

diff --git a/src/base/test/test_timeouts.cc b/src/base/test/test_timeouts.cc
index 006df46..c84cd38 100644 (file)
--- a/src/base/test/test_timeouts.cc
+++ b/src/base/test/test_timeouts.cc
@@ -20,6 +20,10 @@ namespace {
 // For MSan the slowdown depends heavily on the value of msan_track_origins GYP
 // flag. The multiplier below corresponds to msan_track_origins=1.
 static const int kTimeoutMultiplier = 6;
+#elif defined(ADDRESS_SANITIZER) && defined(OS_WIN)
+// Asan/Win has not been optimized yet, give it a higher
+// timeout multiplier. See http://crbug.com/412471
+static const int kTimeoutMultiplier = 8;
 #elif defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || \
     defined(SYZYASAN)
 static const int kTimeoutMultiplier = 2;
@@ -71,7 +75,6 @@ int TestTimeouts::action_max_timeout_ms_ = 45000;
 #else
 int TestTimeouts::action_max_timeout_ms_ = 30000;
 #endif  // NDEBUG
-int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
 
 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
 
@@ -97,8 +100,6 @@ void TestTimeouts::Initialize() {
                     &action_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
                     &action_max_timeout_ms_);
-  InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
-                    &large_test_timeout_ms_);
 
   // Test launcher timeout is independent from anything above action timeout.
   InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
@@ -107,7 +108,6 @@ void TestTimeouts::Initialize() {
   // The timeout values should be increasing in the right order.
   CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
   CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
-  CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
 
   CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
 }