diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
| commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
| tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/components/feedback | |
| parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
| download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz | |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/feedback')
| -rw-r--r-- | chromium/components/feedback/BUILD.gn | 1 | ||||
| -rw-r--r-- | chromium/components/feedback/DEPS | 1 | ||||
| -rw-r--r-- | chromium/components/feedback/feedback_uploader_chrome.cc | 12 |
3 files changed, 11 insertions, 3 deletions
diff --git a/chromium/components/feedback/BUILD.gn b/chromium/components/feedback/BUILD.gn index 2382cc68d44..49ee20401a4 100644 --- a/chromium/components/feedback/BUILD.gn +++ b/chromium/components/feedback/BUILD.gn @@ -30,6 +30,7 @@ static_library("feedback") { deps = [ "//base", + "//components/data_use_measurement/core", "//components/feedback/proto", "//components/keyed_service/content", "//components/keyed_service/core", diff --git a/chromium/components/feedback/DEPS b/chromium/components/feedback/DEPS index 73e72b201f1..d1b80c15c79 100644 --- a/chromium/components/feedback/DEPS +++ b/chromium/components/feedback/DEPS @@ -1,5 +1,6 @@ include_rules = [ "-content", + "+components/data_use_measurement/core", "+components/keyed_service", "+components/pref_registry", "+components/prefs", diff --git a/chromium/components/feedback/feedback_uploader_chrome.cc b/chromium/components/feedback/feedback_uploader_chrome.cc index c59513d6918..9b3cb82e9cf 100644 --- a/chromium/components/feedback/feedback_uploader_chrome.cc +++ b/chromium/components/feedback/feedback_uploader_chrome.cc @@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" +#include "components/data_use_measurement/core/data_use_user_data.h" #include "components/feedback/feedback_report.h" #include "components/feedback/feedback_switches.h" #include "components/feedback/feedback_uploader_delegate.h" @@ -55,11 +56,16 @@ void FeedbackUploaderChrome::DispatchReport(const std::string& data) { AsWeakPtr()), base::Bind(&FeedbackUploaderChrome::RetryReport, AsWeakPtr()))) .release(); - + data_use_measurement::DataUseUserData::AttachToFetcher( + fetcher, data_use_measurement::DataUseUserData::FEEDBACK_UPLOADER); // Tell feedback server about the variation state of this install. net::HttpRequestHeaders headers; - variations::AppendVariationHeaders( - fetcher->GetOriginalURL(), context_->IsOffTheRecord(), false, &headers); + // Note: It's fine to pass in |is_signed_in| false, which does not affect + // transmission of experiment ids coming from the variations server. + bool is_signed_in = false; + variations::AppendVariationHeaders(fetcher->GetOriginalURL(), + context_->IsOffTheRecord(), false, + is_signed_in, &headers); fetcher->SetExtraRequestHeaders(headers.ToString()); fetcher->SetUploadData(kProtoBufMimeType, data); |