| 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_ascriber.h" | 11 #include "components/data_use_measurement/core/data_use_ascriber.h" |
| 12 #include "components/data_use_measurement/core/data_use_recorder.h" | 12 #include "components/data_use_measurement/core/data_use_recorder.h" |
| 13 #include "components/data_use_measurement/core/data_use_user_data.h" | 13 #include "components/data_use_measurement/core/data_use_user_data.h" |
| 14 #include "components/data_use_measurement/core/url_request_classifier.h" | 14 #include "components/data_use_measurement/core/url_request_classifier.h" |
| 15 #include "components/domain_reliability/uploader.h" | 15 #include "components/domain_reliability/uploader.h" |
| 16 #include "google_apis/gaia/gaia_auth_util.h" |
| 16 #include "net/base/network_change_notifier.h" | 17 #include "net/base/network_change_notifier.h" |
| 17 #include "net/base/upload_data_stream.h" | 18 #include "net/base/upload_data_stream.h" |
| 18 #include "net/http/http_response_headers.h" | 19 #include "net/http/http_response_headers.h" |
| 19 #include "net/url_request/url_request.h" | 20 #include "net/url_request/url_request.h" |
| 20 | 21 |
| 21 #if defined(OS_ANDROID) | 22 #if defined(OS_ANDROID) |
| 22 #include "net/android/traffic_stats.h" | 23 #include "net/android/traffic_stats.h" |
| 23 #endif | 24 #endif |
| 24 | 25 |
| 25 namespace data_use_measurement { | 26 namespace data_use_measurement { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 if (!data_use_user_data) { | 98 if (!data_use_user_data) { |
| 98 DataUseUserData::ServiceName service_name = | 99 DataUseUserData::ServiceName service_name = |
| 99 DataUseUserData::ServiceName::NOT_TAGGED; | 100 DataUseUserData::ServiceName::NOT_TAGGED; |
| 100 if (!url_request_classifier_->IsUserRequest(*request) && | 101 if (!url_request_classifier_->IsUserRequest(*request) && |
| 101 domain_reliability::DomainReliabilityUploader:: | 102 domain_reliability::DomainReliabilityUploader:: |
| 102 OriginatedFromDomainReliability(*request)) { | 103 OriginatedFromDomainReliability(*request)) { |
| 103 // Detect if the request originated from DomainReliability. | 104 // Detect if the request originated from DomainReliability. |
| 104 // DataUseUserData::AttachToFetcher() cannot be called from domain | 105 // DataUseUserData::AttachToFetcher() cannot be called from domain |
| 105 // reliability, since it sets userdata on URLFetcher for its purposes. | 106 // reliability, since it sets userdata on URLFetcher for its purposes. |
| 106 service_name = DataUseUserData::ServiceName::DOMAIN_RELIABILITY; | 107 service_name = DataUseUserData::ServiceName::DOMAIN_RELIABILITY; |
| 108 } else if (gaia::RequestOriginatedFromGaia(*request)) { |
| 109 service_name = DataUseUserData::ServiceName::GAIA; |
| 107 } | 110 } |
| 108 | 111 |
| 109 data_use_user_data = new DataUseUserData(service_name, CurrentAppState()); | 112 data_use_user_data = new DataUseUserData(service_name, CurrentAppState()); |
| 110 request->SetUserData(DataUseUserData::kUserDataKey, data_use_user_data); | 113 request->SetUserData(DataUseUserData::kUserDataKey, data_use_user_data); |
| 111 } else { | 114 } else { |
| 112 data_use_user_data->set_app_state(CurrentAppState()); | 115 data_use_user_data->set_app_state(CurrentAppState()); |
| 113 } | 116 } |
| 114 } | 117 } |
| 115 | 118 |
| 116 void DataUseMeasurement::OnBeforeRedirect(const net::URLRequest& request, | 119 void DataUseMeasurement::OnBeforeRedirect(const net::URLRequest& request, |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 STATIC_HISTOGRAM_POINTER_BLOCK( | 418 STATIC_HISTOGRAM_POINTER_BLOCK( |
| 416 "DataUse.ContentType.Services", AddCount(content_type, bytes), | 419 "DataUse.ContentType.Services", AddCount(content_type, bytes), |
| 417 base::LinearHistogram::FactoryGet( | 420 base::LinearHistogram::FactoryGet( |
| 418 "DataUse.ContentType.Services", 1, DataUseUserData::TYPE_MAX, | 421 "DataUse.ContentType.Services", 1, DataUseUserData::TYPE_MAX, |
| 419 DataUseUserData::TYPE_MAX + 1, | 422 DataUseUserData::TYPE_MAX + 1, |
| 420 base::HistogramBase::kUmaTargetedHistogramFlag)); | 423 base::HistogramBase::kUmaTargetedHistogramFlag)); |
| 421 } | 424 } |
| 422 } | 425 } |
| 423 | 426 |
| 424 } // namespace data_use_measurement | 427 } // namespace data_use_measurement |
| OLD | NEW |