NetInfo: Return HTTP layer metrics instead of transport layer

content/browser/net_info_browsertest.cc

 // Copyright 2014 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 <cmath>  // For std::modf.
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
@@ skipping 251 matching lines @@
       network_quality_1);
 
   EXPECT_TRUE(embedded_test_server()->Start());
   EXPECT_TRUE(
       NavigateToURL(shell(), embedded_test_server()->GetURL("/net_info.html")));
 
   FetchHistogramsFromChildProcesses();
   EXPECT_FALSE(
       histogram_tester.GetAllSamples("NQE.RenderThreadNotified").empty());
 
-  EXPECT_EQ(network_quality_1.transport_rtt().InMilliseconds(),
+  EXPECT_EQ(network_quality_1.http_rtt().InMilliseconds(),
             RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(
       static_cast<double>(network_quality_1.downstream_throughput_kbps()) /
           1000,
       RunScriptExtractDouble("getDownlink()"));
 
   // Verify that the network quality change is accessible via Javascript API.
   net::nqe::internal::NetworkQuality network_quality_2(
       base::TimeDelta::FromSeconds(10), base::TimeDelta::FromSeconds(20), 3000);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_2);
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(network_quality_2.transport_rtt().InMilliseconds(),
+  EXPECT_EQ(network_quality_2.http_rtt().InMilliseconds(),
             RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(
       static_cast<double>(network_quality_2.downstream_throughput_kbps()) /
           1000,
       RunScriptExtractDouble("getDownlink()"));
 }
 
 // Make sure the changes in the network quality are rounded to the nearest
 // 25 milliseconds or 25 kbps.
 IN_PROC_BROWSER_TEST_F(NetInfoBrowserTest, NetworkQualityChangeRounded) {
   base::HistogramTester histogram_tester;
   net::TestNetworkQualityEstimator estimator(
       std::unique_ptr<net::ExternalEstimateProvider>(),
       std::map<std::string, std::string>(), false, false, true, true,
       base::MakeUnique<net::BoundTestNetLog>());
   NetworkQualityObserverImpl impl(&estimator);
 
   // Verify that the network quality is rounded properly.
   net::nqe::internal::NetworkQuality network_quality_1(
       base::TimeDelta::FromMilliseconds(123),
       base::TimeDelta::FromMilliseconds(212), 303);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_1);
 
   EXPECT_TRUE(embedded_test_server()->Start());
   EXPECT_TRUE(
       NavigateToURL(shell(), embedded_test_server()->GetURL("/net_info.html")));
-  EXPECT_EQ(200, RunScriptExtractInt("getRtt()"));
+  EXPECT_EQ(125, RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(0.300, RunScriptExtractDouble("getDownlink()"));
 
   net::nqe::internal::NetworkQuality network_quality_2(
-      base::TimeDelta::FromMilliseconds(123),
-      base::TimeDelta::FromMilliseconds(1217), 1317);
+      base::TimeDelta::FromMilliseconds(1123),
+      base::TimeDelta::FromMilliseconds(212), 1317);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_2);
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(1225, RunScriptExtractInt("getRtt()"));
+  EXPECT_EQ(1125, RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(1.325, RunScriptExtractDouble("getDownlink()"));
 
   net::nqe::internal::NetworkQuality network_quality_3(
       base::TimeDelta::FromMilliseconds(12),
       base::TimeDelta::FromMilliseconds(12), 12);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_3);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(0, RunScriptExtractDouble("getDownlink()"));
@@ skipping 10 matching lines @@
   // Verify that the network quality is rounded properly.
   net::nqe::internal::NetworkQuality network_quality_1(
       base::TimeDelta::FromMilliseconds(1123),
       base::TimeDelta::FromMilliseconds(1212), 1303);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_1);
 
   EXPECT_TRUE(embedded_test_server()->Start());
   EXPECT_TRUE(
       NavigateToURL(shell(), embedded_test_server()->GetURL("/net_info.html")));
-  EXPECT_EQ(1200, RunScriptExtractInt("getRtt()"));
+  EXPECT_EQ(1125, RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(1.300, RunScriptExtractDouble("getDownlink()"));
 
   // All the 3 metrics change by less than 10%. So, the observers are not
   // notified.
   net::nqe::internal::NetworkQuality network_quality_2(
       base::TimeDelta::FromMilliseconds(1223),
       base::TimeDelta::FromMilliseconds(1312), 1403);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_2);
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(1200, RunScriptExtractInt("getRtt()"));
+  EXPECT_EQ(1125, RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(1.300, RunScriptExtractDouble("getDownlink()"));
 
-  // Transport RTT has changed by more than 10% from the last notified value of
+  // HTTP RTT has changed by more than 10% from the last notified value of
   // |network_quality_1|. The observers should be notified.
   net::nqe::internal::NetworkQuality network_quality_3(
-      base::TimeDelta::FromMilliseconds(1223),
-      base::TimeDelta::FromMilliseconds(2312), 1403);
+      base::TimeDelta::FromMilliseconds(2223),
+      base::TimeDelta::FromMilliseconds(1312), 1403);
   estimator.NotifyObserversOfRTTOrThroughputEstimatesComputed(
       network_quality_3);
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(2300, RunScriptExtractInt("getRtt()"));
+  EXPECT_EQ(2225, RunScriptExtractInt("getRtt()"));
   EXPECT_EQ(1.400, RunScriptExtractDouble("getDownlink()"));
 }
 
 }  // namespace content