Network traffic annotation added to template_url_fetcher.

components/search_engines/template_url_fetcher.cc

 // Copyright 2014 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/search_engines/template_url_fetcher.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_parser.h"
 #include "components/search_engines/template_url_service.h"
 #include "net/base/load_flags.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"
 
+namespace {
+// Traffic annotation for ReqeustDelegate

[Peter Kasting, 2017/02/28 01:00:15]

Nit: RequestDelegate.  Also, add trailing period.  Also, I'd put blank lines
between this declaration and the surrounding "namespace {"-type lines.

[Ramin Halavati, 2017/02/28 07:33:22]

Done.

+constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
+    net::DefineNetworkTrafficAnnotation("open_search", R"(
+      semantics {
+        sender: "Omnibox"
+        description:
+          "Web pages can include an OpenSearch description doc in their HTML. "
+          "In this case Chromium downloads and parses the file. The "
+          "corresponding search engine is added to the list in the browser "

[Peter Kasting, 2017/02/28 01:00:15]

Nit: browser -> browser settings (or just "settings")

[Ramin Halavati, 2017/02/28 07:33:22]

Done.

+          "(chrome://settings/searchEngines)."
+        trigger:
+          "User visits a web page containing a <link rel="search"> tag."
+        data: "None"
+        destination: WEBSITE
+      }
+      policy {
+        cookies_allowed: false
+        setting: "This feature cannot be disabled in settings."
+        policy_exception_justification:
+          "Not implemented, considered not useful as this feature does not "
+          "upload any data."
+      })");
+}  // namespace
+
 // RequestDelegate ------------------------------------------------------------
 class TemplateURLFetcher::RequestDelegate : public net::URLFetcherDelegate {
  public:
   RequestDelegate(
       TemplateURLFetcher* fetcher,
       const base::string16& keyword,
       const GURL& osdd_url,
       const GURL& favicon_url,
       const URLFetcherCustomizeCallback& url_fetcher_customize_callback);
 
@@ skipping 23 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(RequestDelegate);
 };
 
 TemplateURLFetcher::RequestDelegate::RequestDelegate(
     TemplateURLFetcher* fetcher,
     const base::string16& keyword,
     const GURL& osdd_url,
     const GURL& favicon_url,
     const URLFetcherCustomizeCallback& url_fetcher_customize_callback)
-    : url_fetcher_(
-          net::URLFetcher::Create(osdd_url, net::URLFetcher::GET, this)),
+    : url_fetcher_(net::URLFetcher::Create(osdd_url,
+                                           net::URLFetcher::GET,
+                                           this,
+                                           kTrafficAnnotation)),
       fetcher_(fetcher),
       keyword_(keyword),
       osdd_url_(osdd_url),
       favicon_url_(favicon_url) {
   TemplateURLService* model = fetcher_->template_url_service_;
   DCHECK(model);  // TemplateURLFetcher::ScheduleDownload verifies this.
 
   if (!model->loaded()) {
     // Start the model load and set-up waiting for it.
     template_url_subscription_ = model->RegisterOnLoadedCallback(
@@ skipping 145 matching lines @@
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   auto i = std::find_if(requests_.begin(), requests_.end(),
                         [request](const std::unique_ptr<RequestDelegate>& ptr) {
                           return ptr.get() == request;
                         });
   DCHECK(i != requests_.end());
   requests_.erase(i);
 }