| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/metrics/network_stats_uploader.h" | 5 #include "chrome/browser/metrics/network_stats_uploader.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/metrics/time_ticks_experiment_win.h" | 8 #include "chrome/browser/metrics/time_ticks_experiment_win.h" |
| 9 #include "chrome/browser/net/http_pipelining_compatibility_client.h" | |
| 10 #include "chrome/browser/net/network_stats.h" | 9 #include "chrome/browser/net/network_stats.h" |
| 11 #include "chrome/common/net/test_server_locations.h" | 10 #include "chrome/common/net/test_server_locations.h" |
| 12 | 11 |
| 13 #if !defined(OS_POSIX) | 12 #if !defined(OS_POSIX) |
| 14 #include "chrome/installer/util/browser_distribution.h" | 13 #include "chrome/installer/util/browser_distribution.h" |
| 15 #endif | 14 #endif |
| 16 | 15 |
| 17 NetworkStatsUploader::NetworkStatsUploader() { | 16 NetworkStatsUploader::NetworkStatsUploader() { |
| 18 #if defined(OS_POSIX) | 17 #if defined(OS_POSIX) |
| 19 network_stats_server_ = chrome_common_net::kEchoTestServerLocation; | 18 network_stats_server_ = chrome_common_net::kEchoTestServerLocation; |
| 20 http_pipelining_test_server_ = chrome_common_net::kPipelineTestServerBaseUrl; | |
| 21 #else | 19 #else |
| 22 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); | 20 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); |
| 23 network_stats_server_ = dist->GetNetworkStatsServer(); | 21 network_stats_server_ = dist->GetNetworkStatsServer(); |
| 24 http_pipelining_test_server_ = dist->GetHttpPipeliningTestServer(); | |
| 25 #endif | 22 #endif |
| 26 } | 23 } |
| 27 | 24 |
| 28 NetworkStatsUploader::~NetworkStatsUploader() { | 25 NetworkStatsUploader::~NetworkStatsUploader() { |
| 29 } | 26 } |
| 30 | 27 |
| 31 void NetworkStatsUploader::CollectAndReportNetworkStats() { | 28 void NetworkStatsUploader::CollectAndReportNetworkStats() { |
| 32 IOThread* io_thread = g_browser_process->io_thread(); | 29 IOThread* io_thread = g_browser_process->io_thread(); |
| 33 if (!io_thread) | 30 if (!io_thread) |
| 34 return; | 31 return; |
| 35 | 32 |
| 36 chrome_browser_net::CollectNetworkStats(network_stats_server_, io_thread); | 33 chrome_browser_net::CollectNetworkStats(network_stats_server_, io_thread); |
| 37 chrome_browser_net::CollectPipeliningCapabilityStatsOnUIThread( | |
| 38 http_pipelining_test_server_, io_thread); | |
| 39 #if defined(OS_WIN) | 34 #if defined(OS_WIN) |
| 40 chrome::CollectTimeTicksStats(); | 35 chrome::CollectTimeTicksStats(); |
| 41 #endif | 36 #endif |
| 42 } | 37 } |
| OLD | NEW |