Network traffic annotation added to distiller_url_fetcher.

components/dom_distiller/core/distiller_url_fetcher.cc

 // Copyright 2013 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/dom_distiller/core/distiller_url_fetcher.h"
 
 #include "components/data_use_measurement/core/data_use_user_data.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_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 using net::URLFetcher;
 
 namespace dom_distiller {
 
@@ skipping 21 matching lines @@
   // Don't allow a fetch if one is pending.
   DCHECK(!url_fetcher_ || !url_fetcher_->GetStatus().is_io_pending());
   callback_ = callback;
   url_fetcher_ = CreateURLFetcher(context_getter_, url);
   url_fetcher_->Start();
 }
 
 std::unique_ptr<URLFetcher> DistillerURLFetcher::CreateURLFetcher(
     net::URLRequestContextGetter* context_getter,
     const std::string& url) {
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(

[wychen, 2017/02/23 21:31:24]

Nit: raw strings should not be indented with the rest of the code, or you'll get
extra spaces in front of each lines. Probably fine functional-wise since it's
still valid JSON, but this slightly increases the binary size.

[wychen, 2017/02/23 21:31:25]

unique id: "dom_distiller"

[Ramin Halavati, 2017/02/24 09:03:49]

Annotation raw strings are optimized out of binary code, and only the unique id
will stay in the binary. Raw strings are extracted using a clang tool and while
converting to protobufs, the extra spaces are removed.

+        semantics {
+          sender: "..."

[wychen, 2017/02/23 21:31:24]

sender: "DOM Distiller"

[Ramin Halavati, 2017/02/24 09:03:49]

Done.

+          description: "..."

[wychen, 2017/02/23 21:31:24]

description: "Google Chrome provides Mobile-friendly view on Android phones when
the web page contains an article, and is not mobile-friendly. If the user enters
Mobile-friendly view, the main content would be extracted and reflowed for
better readability. DOM distiller is the backend service for Mobile-friendly
view, Reader Mode, and Reading List."

[Ramin Halavati, 2017/02/24 09:03:49]

Done.

+          trigger: "..."

[wychen, 2017/02/23 21:31:24]

trigger: "User enters Mobile-friendly view, Reader Mode, or Reading List."

[Ramin Halavati, 2017/02/24 09:03:48]

Done.

+          data: "..."

[wychen, 2017/02/23 21:31:24]

data: "URL of the required website resources to fetch. No user information is
sent."

[Ramin Halavati, 2017/02/24 09:03:49]

Done.

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[wychen, 2017/02/23 21:31:25]

destination: WEBSITE

[Ramin Halavati, 2017/02/24 09:03:49]

Done.

+        }
+        policy {
+          cookies_allowed: false/true

[wychen, 2017/02/23 21:31:25]

cookies_allowed: true

[Ramin Halavati, 2017/02/24 09:03:49]

Done.

+          cookies_store: "..."

[wychen, 2017/02/23 21:31:24]

cookies_store: "user"

[Ramin Halavati, 2017/02/24 09:03:48]

Done.

+          setting: "..."

[wychen, 2017/02/23 21:31:24]

setting: "You can enable or disable Mobile-friendly view by toggling
chrome://flags#reader-mode-heuristics in Chrome on Android. Reader Mode and
Reading List can be enabled or disabled in Chrome iOS settings."

[Olivier, 2017/02/24 08:36:16]

Reader mode is not publicly shipped on iOS. Only public visible feature is
Reading List (which use distilled pages).

[Ramin Halavati, 2017/02/24 09:03:49]

Please advise on the settings comment for Reading List and Reader mode.

[wychen, 2017/02/24 18:22:10]

Then I guess we don't mention Reader Mode on iOS at all. We won't be able to
turn off Reading List when we launch, right?

+          policy {

[wychen, 2017/02/23 21:31:24]

No policies.

[Ramin Halavati, 2017/02/24 09:03:49]

Done.

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

[wychen, 2017/02/23 21:31:25]

policy_exception_justification: "Not implemented, considered not useful as no
content is being uploaded; this request merely downloads the resources on the
web."

[Ramin Halavati, 2017/02/24 09:03:48]

Done.

+        })");
   std::unique_ptr<net::URLFetcher> fetcher =
-      URLFetcher::Create(GURL(url), URLFetcher::GET, this);
+      URLFetcher::Create(GURL(url), URLFetcher::GET, this, traffic_annotation);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       fetcher.get(), data_use_measurement::DataUseUserData::DOM_DISTILLER);
   fetcher->SetRequestContext(context_getter);
   static const int kMaxRetries = 5;
   fetcher->SetMaxRetriesOn5xx(kMaxRetries);
   return fetcher;
 }
 
 void DistillerURLFetcher::OnURLFetchComplete(
     const URLFetcher* source) {
   std::string response;
   if (source && source->GetStatus().is_success() &&
       source->GetResponseCode() == net::HTTP_OK) {
     // Only copy over the data if the request was successful. Insert
     // an empty string into the proto otherwise.
     source->GetResponseAsString(&response);
   }
   callback_.Run(response);
 }
 
 }  // namespace dom_distiller