Revert 111074 - ASAN timeout on OutOfProcessPPAPITest.*

base/test/test_timeouts.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/test_timeouts.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_switches.h"
 
 namespace {
 
 #ifdef ADDRESS_SANITIZER
-static const int kTimeoutMultiplier = 4;
+static const int kTimeoutMultiplier = 2;
 #else
 static const int kTimeoutMultiplier = 1;
 #endif
 
 // Sets value to the greatest of:
 // 1) value's current value multiplied by kTimeoutMultiplier (assuming
 // InitializeTimeout is called only once per value).
 // 2) min_value.
 // 3) the numerical value given by switch_name on the command line multiplied
 // by kTimeoutMultiplier.
@@ skipping 47 matching lines @@
   InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
                     &action_max_timeout_ms_);
   InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
                     &large_test_timeout_ms_);
 
   // 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_);
 }