Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: components/data_use_measurement/core/data_use_measurement.cc

Issue 2538313002: Fix data usage tracking for domain reliability service (Closed)
Patch Set: Rebased Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/data_use_measurement/core/DEPS ('k') | components/domain_reliability/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_use_measurement/core/data_use_measurement.cc
diff --git a/components/data_use_measurement/core/data_use_measurement.cc b/components/data_use_measurement/core/data_use_measurement.cc
index 5ded37e7fe909e0d0e6929b772d9cec655a7afa9..c7f1f69579d3d9dd0bb00fac9253247e6867cf74 100644
--- a/components/data_use_measurement/core/data_use_measurement.cc
+++ b/components/data_use_measurement/core/data_use_measurement.cc
@@ -10,6 +10,7 @@
#include "build/build_config.h"
#include "components/data_use_measurement/core/data_use_user_data.h"
#include "components/data_use_measurement/core/url_request_classifier.h"
+#include "components/domain_reliability/uploader.h"
#include "net/base/network_change_notifier.h"
#include "net/base/upload_data_stream.h"
#include "net/http/http_response_headers.h"
@@ -89,8 +90,18 @@ void DataUseMeasurement::OnBeforeURLRequest(net::URLRequest* request) {
DataUseUserData* data_use_user_data = reinterpret_cast<DataUseUserData*>(
request->GetUserData(DataUseUserData::kUserDataKey));
if (!data_use_user_data) {
- data_use_user_data = new DataUseUserData(
- DataUseUserData::ServiceName::NOT_TAGGED, CurrentAppState());
+ DataUseUserData::ServiceName service_name =
+ DataUseUserData::ServiceName::NOT_TAGGED;
+ if (!url_request_classifier_->IsUserRequest(*request) &&
+ domain_reliability::DomainReliabilityUploader::
+ OriginatedFromDomainReliability(*request)) {
+ // Detect if the request originated from DomainReliability.
+ // DataUseUserData::AttachToFetcher() cannot be called from domain
+ // reliability, since it sets userdata on URLFetcher for its purposes.
+ service_name = DataUseUserData::ServiceName::NOT_TAGGED;
+ }
+
+ data_use_user_data = new DataUseUserData(service_name, CurrentAppState());
request->SetUserData(DataUseUserData::kUserDataKey, data_use_user_data);
}
}
« no previous file with comments | « components/data_use_measurement/core/DEPS ('k') | components/domain_reliability/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698