Update the warmup timeout params based in data reduction proxy.

These are the params that we have been using in the server-side field trial.

Bug: 760294
Change-Id: I625e8c41b8acc005edaec8515b617198013b775a
Reviewed-on: https://chromium-review.googlesource.com/1104778Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568079}

components/data_reduction_proxy/core/browser/warmup_url_fetcher.cc

@@ -213,7 +213,7 @@ base::TimeDelta WarmupURLFetcher::GetFetchTimeout() const {
   const base::TimeDelta min_timeout =
       base::TimeDelta::FromSeconds(GetFieldTrialParamByFeatureAsInt(
           features::kDataReductionProxyRobustConnection,
-          "warmup_url_fetch_min_timeout_seconds", 8));
+          "warmup_url_fetch_min_timeout_seconds", 10));
   const base::TimeDelta max_timeout =
       base::TimeDelta::FromSeconds(GetFieldTrialParamByFeatureAsInt(
           features::kDataReductionProxyRobustConnection,
@@ -226,17 +226,11 @@ base::TimeDelta WarmupURLFetcher::GetFetchTimeout() const {
   // has been tried.
   size_t http_rtt_multiplier = GetFieldTrialParamByFeatureAsInt(
       features::kDataReductionProxyRobustConnection,
-      "warmup_url_fetch_init_http_rtt_multiplier", 5);
+      "warmup_url_fetch_init_http_rtt_multiplier", 12);
   if (previous_attempt_counts_ == 1) {
-    http_rtt_multiplier = GetFieldTrialParamByFeatureAsInt(
-                              features::kDataReductionProxyRobustConnection,
-                              "warmup_url_fetch_init_http_rtt_multiplier", 5) *
-                          2;
+    http_rtt_multiplier *= 2;
   } else if (previous_attempt_counts_ == 2) {
-    http_rtt_multiplier = GetFieldTrialParamByFeatureAsInt(
-                              features::kDataReductionProxyRobustConnection,
-                              "warmup_url_fetch_init_http_rtt_multiplier", 5) *
-                          4;
+    http_rtt_multiplier *= 4;
   }
   // Sanity checks.
   DCHECK_LT(0u, http_rtt_multiplier);

components/data_reduction_proxy/core/browser/warmup_url_fetcher_unittest.cc

@@ -525,7 +525,7 @@ TEST(WarmupURLFetcherTest, TestSuccessfulFetchWarmupURLWithDelay) {
 
 TEST(WarmupURLFetcherTest, TestFetchTimeoutIncreasing) {
   // Must remain in sync with warmup_url_fetcher.cc.
-  constexpr base::TimeDelta kMinTimeout = base::TimeDelta::FromSeconds(8);
+  constexpr base::TimeDelta kMinTimeout = base::TimeDelta::FromSeconds(10);
   constexpr base::TimeDelta kMaxTimeout = base::TimeDelta::FromSeconds(60);
 
   base::HistogramTester histogram_tester;
@@ -549,20 +549,20 @@ TEST(WarmupURLFetcherTest, TestFetchTimeoutIncreasing) {
 
   base::TimeDelta http_rtt = base::TimeDelta::FromSeconds(2);
   estimator.SetStartTimeNullHttpRtt(http_rtt);
-  EXPECT_EQ(http_rtt * 5, warmup_url_fetcher.GetFetchTimeout());
+  EXPECT_EQ(http_rtt * 12, warmup_url_fetcher.GetFetchTimeout());
 
   warmup_url_fetcher.FetchWarmupURL(1);
-  EXPECT_EQ(http_rtt * 10, warmup_url_fetcher.GetFetchTimeout());
+  EXPECT_EQ(http_rtt * 24, warmup_url_fetcher.GetFetchTimeout());
 
   warmup_url_fetcher.FetchWarmupURL(2);
-  EXPECT_EQ(http_rtt * 20, warmup_url_fetcher.GetFetchTimeout());
+  EXPECT_EQ(kMaxTimeout, warmup_url_fetcher.GetFetchTimeout());
 
   http_rtt = base::TimeDelta::FromSeconds(5);
   estimator.SetStartTimeNullHttpRtt(http_rtt);
   EXPECT_EQ(kMaxTimeout, warmup_url_fetcher.GetFetchTimeout());
 
   warmup_url_fetcher.FetchWarmupURL(0);
-  EXPECT_EQ(http_rtt * 5, warmup_url_fetcher.GetFetchTimeout());
+  EXPECT_EQ(http_rtt * 12, warmup_url_fetcher.GetFetchTimeout());
 }
 
 TEST(WarmupURLFetcherTest, TestFetchTimeoutIncreasingWithFieldTrial) {