| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/data_use_measurement/core/data_use_measurement.h" | 5 #include "components/data_use_measurement/core/data_use_measurement.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
| 8 #include "base/metrics/sparse_histogram.h" | 8 #include "base/metrics/sparse_histogram.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "components/data_use_measurement/core/data_use_user_data.h" | 11 #include "components/data_use_measurement/core/data_use_user_data.h" |
| 12 #include "components/data_use_measurement/core/url_request_classifier.h" | 12 #include "components/data_use_measurement/core/url_request_classifier.h" |
| 13 #include "components/domain_reliability/uploader.h" | 13 #include "components/domain_reliability/uploader.h" |
| 14 #include "google_apis/gaia/gaia_auth_util.h" |
| 14 #include "net/base/network_change_notifier.h" | 15 #include "net/base/network_change_notifier.h" |
| 15 #include "net/base/upload_data_stream.h" | 16 #include "net/base/upload_data_stream.h" |
| 16 #include "net/http/http_response_headers.h" | 17 #include "net/http/http_response_headers.h" |
| 17 #include "net/url_request/url_request.h" | 18 #include "net/url_request/url_request.h" |
| 18 | 19 |
| 19 #if defined(OS_ANDROID) | 20 #if defined(OS_ANDROID) |
| 20 #include "net/android/traffic_stats.h" | 21 #include "net/android/traffic_stats.h" |
| 21 #endif | 22 #endif |
| 22 | 23 |
| 23 namespace data_use_measurement { | 24 namespace data_use_measurement { |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 if (!data_use_user_data) { | 93 if (!data_use_user_data) { |
| 93 DataUseUserData::ServiceName service_name = | 94 DataUseUserData::ServiceName service_name = |
| 94 DataUseUserData::ServiceName::NOT_TAGGED; | 95 DataUseUserData::ServiceName::NOT_TAGGED; |
| 95 if (!url_request_classifier_->IsUserRequest(*request) && | 96 if (!url_request_classifier_->IsUserRequest(*request) && |
| 96 domain_reliability::DomainReliabilityUploader:: | 97 domain_reliability::DomainReliabilityUploader:: |
| 97 OriginatedFromDomainReliability(*request)) { | 98 OriginatedFromDomainReliability(*request)) { |
| 98 // Detect if the request originated from DomainReliability. | 99 // Detect if the request originated from DomainReliability. |
| 99 // DataUseUserData::AttachToFetcher() cannot be called from domain | 100 // DataUseUserData::AttachToFetcher() cannot be called from domain |
| 100 // reliability, since it sets userdata on URLFetcher for its purposes. | 101 // reliability, since it sets userdata on URLFetcher for its purposes. |
| 101 service_name = DataUseUserData::ServiceName::NOT_TAGGED; | 102 service_name = DataUseUserData::ServiceName::NOT_TAGGED; |
| 103 } else if (gaia::RequestOriginatedFromGaia(*request)) { |
| 104 service_name = DataUseUserData::ServiceName::NOT_TAGGED; |
| 102 } | 105 } |
| 103 | 106 |
| 104 data_use_user_data = new DataUseUserData(service_name, CurrentAppState()); | 107 data_use_user_data = new DataUseUserData(service_name, CurrentAppState()); |
| 105 request->SetUserData(DataUseUserData::kUserDataKey, data_use_user_data); | 108 request->SetUserData(DataUseUserData::kUserDataKey, data_use_user_data); |
| 106 } | 109 } |
| 107 } | 110 } |
| 108 | 111 |
| 109 void DataUseMeasurement::OnBeforeRedirect(const net::URLRequest& request, | 112 void DataUseMeasurement::OnBeforeRedirect(const net::URLRequest& request, |
| 110 const GURL& new_location) { | 113 const GURL& new_location) { |
| 111 // Recording data use of request on redirects. | 114 // Recording data use of request on redirects. |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 message_size); | 327 message_size); |
| 325 if (message_size > 0) { | 328 if (message_size > 0) { |
| 326 IncreaseSparseHistogramByValue( | 329 IncreaseSparseHistogramByValue( |
| 327 GetHistogramName("DataUse.MessageSize.AllServices", dir, app_state, | 330 GetHistogramName("DataUse.MessageSize.AllServices", dir, app_state, |
| 328 is_connection_cellular), | 331 is_connection_cellular), |
| 329 service, message_size); | 332 service, message_size); |
| 330 } | 333 } |
| 331 } | 334 } |
| 332 | 335 |
| 333 } // namespace data_use_measurement | 336 } // namespace data_use_measurement |
| OLD | NEW |