Network traffic annotation added to ntp_snippets.

components/ntp_snippets/remote/json_request.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_snippets/remote/json_request.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 12 matching lines @@
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "components/variations/variations_associated_data.h"
 #include "grit/components_strings.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/common/unicode/utypes.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using net::URLFetcher;
 using net::URLRequestContextGetter;
 using net::HttpRequestHeaders;
 using net::URLRequestStatus;
@@ skipping 381 matching lines @@
   bool success = base::JSONWriter::WriteWithOptions(
       *request, base::JSONWriter::OPTIONS_PRETTY_PRINT, &request_json);
   DCHECK(success);
   return request_json;
 }
 
 std::unique_ptr<net::URLFetcher> JsonRequest::Builder::BuildURLFetcher(
     net::URLFetcherDelegate* delegate,
     const std::string& headers,
     const std::string& body) const {
-  std::unique_ptr<net::URLFetcher> url_fetcher =
-      net::URLFetcher::Create(url_, net::URLFetcher::POST, delegate);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(

[Marc Treib, 2017/02/23 14:53:46]

ntp_snippets_fetch

[Ramin Halavati, 2017/02/27 10:31:22]

Done.

+        semantics {
+          sender: "..."

[Marc Treib, 2017/02/23 14:53:46]

New Tab page content suggestions fetch

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+          description: "..."

[Marc Treib, 2017/02/23 14:53:46]

Google Chrome can show content suggestions (e.g. news articles) on the New Tab
page. For signed-in users, these may be personalized based on the user's synced
browsing history.

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+          trigger: "..."

[Marc Treib, 2017/02/23 14:53:46]

Triggered periodically in the background, or upon explicit user request.

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+          data: "..."

[Marc Treib, 2017/02/23 14:53:46]

The Chrome UI language, as well as a second language the user understands, based
on translate::LanguageModel. For signed-in users, the requests is authenticated.

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[Marc Treib, 2017/02/23 14:53:46]

GOOGLE_OWNED_SERVICE

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+        }
+        policy {
+          cookies_allowed: false/true

[Marc Treib, 2017/02/23 14:53:46]

false (I think? Not exactly sure what "cookies/channel IDs/..." covers)

[Ramin Halavati, 2017/02/27 10:31:21]

Yes, LoadFlags are set to not send or save cookie.

+          cookies_store: "..."

[Marc Treib, 2017/02/23 14:53:46]

n/a

[Ramin Halavati, 2017/02/27 10:31:22]

Done.

+          setting: "..."

[Marc Treib, 2017/02/23 14:53:46]

n/a (though we might add one; see crbug.com/695129)

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+          policy {
+            [POLICY_NAME] {

[Marc Treib, 2017/02/23 14:53:46]

NTPContentSuggestionsEnabled

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}

[Marc Treib, 2017/02/23 14:53:46]

Not sure what this means?

Currently the policy is set to "false" (i.e. disable NTP content suggestions)
for all enterprise users, but that will likely change soon.

[Ramin Halavati, 2017/02/27 10:31:21]

Done.

+              value: ...

[Marc Treib, 2017/02/23 14:53:46]

?

[Ramin Halavati, 2017/02/27 10:31:21]

It should be the value that disables this feature, i.e. false.

+            }
+          }
+          policy_exception_justification: "..."
+        })");
+  std::unique_ptr<net::URLFetcher> url_fetcher = net::URLFetcher::Create(
+      url_, net::URLFetcher::POST, delegate, traffic_annotation);
   url_fetcher->SetRequestContext(url_request_context_getter_.get());
   url_fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                             net::LOAD_DO_NOT_SAVE_COOKIES);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       url_fetcher.get(),
       data_use_measurement::DataUseUserData::NTP_SNIPPETS_SUGGESTIONS);
 
   url_fetcher->SetExtraRequestHeaders(headers);
   url_fetcher->SetUploadData("application/json", body);
 
@@ skipping 36 matching lines @@
           "NewTabPage.Languages.UILanguageRatioInTwoTopLanguages",
           ratio_ui_in_both_languages * 100);
       break;
     }
   }
 }
 
 }  // namespace internal
 
 }  // namespace ntp_snippets