Use request start time for estimating network quality.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 4059 matching lines @@
         EXPECT_EQ(ERR_CONTENT_LENGTH_MISMATCH, r->status().error())
             << " Parameter = \"" << test_file << "\"";
       }
     }
   }
 }
 
 TEST_F(URLRequestTestHTTP, NetworkQualityEstimator) {
   ASSERT_TRUE(test_server_.Start());
   // Enable requests to local host to be used for network quality estimation.
-  NetworkQualityEstimator estimator(true);
+  NetworkQualityEstimator estimator(true, true);
 
   TestDelegate d;
   TestNetworkDelegate network_delegate;  // Must outlive URLRequest.
   TestURLRequestContext context(true);
   context.set_network_quality_estimator(&estimator);
   context.set_network_delegate(&network_delegate);
   context.Init();
 
-  uint64_t min_transfer_size_in_bytes =
-      NetworkQualityEstimator::kMinTransferSizeInBytes;
-  // Create a long enough URL such that response size exceeds network quality
-  // estimator's minimum transfer size.
-  std::string url = "echo.html?";
-  url.append(min_transfer_size_in_bytes, 'x');
+  std::string url = "echo.html";
 
   scoped_ptr<URLRequest> r(
       context.CreateRequest(test_server_.GetURL(url), DEFAULT_PRIORITY, &d));
-  int sleep_duration_milliseconds = 1;
-  base::PlatformThread::Sleep(
-      base::TimeDelta::FromMilliseconds(sleep_duration_milliseconds));
   r->Start();
 
   base::RunLoop().Run();
 
   NetworkQuality network_quality =
       context.network_quality_estimator()->GetPeakEstimate();
-  EXPECT_GE(network_quality.rtt(),
-            base::TimeDelta::FromMilliseconds(sleep_duration_milliseconds));
+  EXPECT_GE(network_quality.rtt(), base::TimeDelta());
+  EXPECT_LT(network_quality.rtt(), base::TimeDelta::Max());
   EXPECT_GT(network_quality.downstream_throughput_kbps(), 0);
 
   // Verify that histograms are not populated. They should populate only when
   // there is a change in ConnectionType.
   base::HistogramTester histogram_tester;
   histogram_tester.ExpectTotalCount("NQE.PeakKbps.Unknown", 0);
   histogram_tester.ExpectTotalCount("NQE.FastestRTT.Unknown", 0);
 
   NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeForTests(
       NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI);
@@ skipping 5059 matching lines @@
       GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d));
 
   EXPECT_FALSE(req->response_info().network_accessed);
 
   req->Start();
   base::RunLoop().Run();
   EXPECT_TRUE(req->response_info().network_accessed);
 }
 
 }  // namespace net