Index: components/feedback/feedback_uploader_chrome.cc |
diff --git a/components/feedback/feedback_uploader_chrome.cc b/components/feedback/feedback_uploader_chrome.cc |
index 0b18305d920b12584508bebbf8cb9d4b63cfb666..ede152c45cc177bfd14f711034770904d10e8415 100644 |
--- a/components/feedback/feedback_uploader_chrome.cc |
+++ b/components/feedback/feedback_uploader_chrome.cc |
@@ -20,6 +20,7 @@ |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/storage_partition.h" |
#include "net/base/load_flags.h" |
+#include "net/traffic_annotation/network_traffic_annotation.h" |
#include "net/url_request/url_fetcher.h" |
#include "url/gurl.h" |
@@ -47,14 +48,42 @@ FeedbackUploaderChrome::FeedbackUploaderChrome( |
void FeedbackUploaderChrome::DispatchReport(const std::string& data) { |
GURL post_url(url_); |
+ net::NetworkTrafficAnnotationTag traffic_annotation = |
+ net::DefineNetworkTrafficAnnotation("chrome_feedback_report_app", R"( |
+ semantics { |
+ sender: "Chrome Feedback Report App" |
+ description: |
+ "Users can press Alt+Shift+i to report a bug or a feedback in " |
+ "general. Along with their text, system logs that helps in " |
msramek
2017/03/14 22:20:59
nit: s/their/text/the free-form text they entered/
Ramin Halavati
2017/03/15 06:08:01
Done.
|
+ "diagnosis of the issue are sent to Google. This service uploads " |
+ "the report to Google feedback server." |
msramek
2017/03/14 22:20:59
nit: Feedback
Ramin Halavati
2017/03/15 06:08:01
Done.
|
+ trigger: |
+ "When user chooses to send a feedback to Google." |
+ data: |
+ "User entered message and useful debugging logs. The logs are " |
msramek
2017/03/14 22:20:59
nit: User-entered ("User entered" reads as a subje
afakhry
2017/03/15 03:01:32
All sorts of logs, UI logs, chrome logs, kernel lo
Ramin Halavati
2017/03/15 06:08:01
Done.
msramek
2017/03/15 09:41:11
The reason why I'm asking is that I see two checkb
afakhry
2017/03/15 16:00:11
If the user unchecks the entry for "system informa
Ramin Halavati
2017/03/16 06:51:59
Acknowledged.
|
+ "anonymized to remove any user-private data. The user can also " |
+ "view the system information before sending, and choose to send " |
+ "the feedback report without the logs, the screenshot, or even " |
+ "his/her email address." |
+ destination: GOOGLE_OWNED_SERVICE |
+ } |
+ policy { |
+ cookies_allowed: false |
+ setting: |
+ "This feature cannot be disabled by settings and is only activated " |
+ "by direct user request." |
+ policy_exception_justification: "Not implemented." |
+ })"); |
// Note: FeedbackUploaderDelegate deletes itself and the fetcher. |
net::URLFetcher* fetcher = |
net::URLFetcher::Create( |
post_url, net::URLFetcher::POST, |
new FeedbackUploaderDelegate( |
- data, base::Bind(&FeedbackUploaderChrome::UpdateUploadTimer, |
- AsWeakPtr()), |
- base::Bind(&FeedbackUploaderChrome::RetryReport, AsWeakPtr()))) |
+ data, |
+ base::Bind(&FeedbackUploaderChrome::UpdateUploadTimer, |
+ AsWeakPtr()), |
+ base::Bind(&FeedbackUploaderChrome::RetryReport, AsWeakPtr())), |
+ traffic_annotation) |
.release(); |
data_use_measurement::DataUseUserData::AttachToFetcher( |
fetcher, data_use_measurement::DataUseUserData::FEEDBACK_UPLOADER); |