Network traffic annotation added to popular_sites_impl.

components/ntp_tiles/popular_sites_impl.cc

 // Copyright 2015 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_tiles/popular_sites_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/service/variations_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
 #include "base/json/json_reader.h"
 #include "components/grit/components_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #endif
 
 #if defined(OS_IOS)
 #include "components/ntp_tiles/country_code_ios.h"
 #endif
@@ skipping 255 matching lines @@
   user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideVersion,
                                  std::string());
 
   user_prefs->RegisterInt64Pref(kPopularSitesLastDownloadPref, 0);
   user_prefs->RegisterStringPref(kPopularSitesURLPref, std::string());
   user_prefs->RegisterListPref(kPopularSitesJsonPref,
                                DefaultPopularSites().release());
 }
 
 void PopularSitesImpl::FetchPopularSites() {
-  fetcher_ = URLFetcher::Create(pending_url_, URLFetcher::GET, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(

[Marc Treib, 2017/02/22 09:49:37]

popular_sites or popular_sites_fetch?

[sfiera, 2017/02/22 10:06:12]

Should we prefix "popular sites" with "new tab page" where it appears here and
below? If these identifiers are going to be user-visible, then we should make
sure not to imply that this is the bandwidth that popular sites are using.

[Ramin Halavati, 2017/02/22 10:35:08]

The first identifier is mostly a unique (meaningful) id, and the sender would be
used in reports and needs to be human readable and 

+        semantics {
+          sender: "..."

[Marc Treib, 2017/02/22 09:49:37]

popular sites

[Ramin Halavati, 2017/02/22 10:35:08]

Done.

+          description: "..."

[Marc Treib, 2017/02/22 09:49:37]

Google Chrome may display a list of regionally-popular web sites on the New Tab
Page.

[sfiera, 2017/02/22 10:06:12]

Do we not disable it for enterprise users, as we do articles for you?

[Marc Treib, 2017/02/22 12:16:37]

No, I don't think so.
Shouldn't be too hard to set up, but AFAIK nobody has asked for it.

+          trigger: "..."

[Marc Treib, 2017/02/22 09:49:37]

Triggered automatically once per day, unless no popular web sites are required
(because the New Tab Page is filled with suggestions based on the user's
browsing history).

[Ramin Halavati, 2017/02/22 10:35:08]

Done.

+          data: "..."

[Marc Treib, 2017/02/22 09:49:37]

A two-letter country code based on the user's location.

[Ramin Halavati, 2017/02/22 10:35:08]

Done.

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[Marc Treib, 2017/02/22 09:49:37]

GOOGLE_OWNED_SERVICE

[Ramin Halavati, 2017/02/22 10:35:08]

Done.

+        }
+        policy {
+          cookies_allowed: false/true

[Marc Treib, 2017/02/22 09:49:36]

false

[Ramin Halavati, 2017/02/22 10:35:09]

Done.

+          cookies_store: "..."

[Marc Treib, 2017/02/22 09:49:37]

n/a

[Ramin Halavati, 2017/02/22 10:35:09]

Done.

+          setting: "..."

[Marc Treib, 2017/02/22 09:49:36]

NA

[Ramin Halavati, 2017/02/22 10:35:09]

Done.

+          policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              value: ...
+            }
+          }
+          policy_exception_justification: "..."

[Marc Treib, 2017/02/22 09:49:37]

Not sure - since we don't send any PII, I think a policy is generally not
required?

[Ramin Halavati, 2017/02/22 10:35:08]

But as you are sending user's country, it might cause a privacy concern. 
battre@:
Any comments?

+        })");
+  fetcher_ = URLFetcher::Create(pending_url_, URLFetcher::GET, this,
+                                traffic_annotation);
   data_use_measurement::DataUseUserData::AttachToFetcher(

[sfiera, 2017/02/22 10:06:12]

Will this new feature eventually supersede data_use_measurement?

[Ramin Halavati, 2017/02/22 10:35:09]

I don't think so.

battre@:
Any comments?

[Marc Treib, 2017/02/22 12:16:37]

I wondered the same thing: We now have two things that should be attached to
every URLFetcher. But since they have completely different purposes, I'm not
sure if it makes sense to merge them.

       fetcher_.get(), data_use_measurement::DataUseUserData::NTP_TILES);
   fetcher_->SetRequestContext(download_context_);
   fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                          net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher_->SetAutomaticallyRetryOnNetworkChanges(1);
   fetcher_->Start();
 }
 
 void PopularSitesImpl::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK_EQ(fetcher_.get(), source);
@@ skipping 43 matching lines @@
     pending_url_ = GetPopularSitesURL(kPopularSitesDefaultCountryCode,
                                       kPopularSitesDefaultVersion);
     FetchPopularSites();
   } else {
     DLOG(WARNING) << "Download fallback site list failed";
     callback_.Run(false);
   }
 }
 
 }  // namespace ntp_tiles