Network traffic annotation added to OAuth2ApiCallFlow and its subclasses.

google_apis/gaia/oauth2_api_call_flow.cc

 // Copyright (c) 2012 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 "google_apis/gaia/oauth2_api_call_flow.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/stringprintf.h"
@@ skipping 61 matching lines @@
   CHECK(source);
   CHECK_EQ(API_CALL_STARTED, state_);
   EndApiCall(source);
 }
 
 std::unique_ptr<URLFetcher> OAuth2ApiCallFlow::CreateURLFetcher(
     net::URLRequestContextGetter* context,
     const std::string& access_token) {
   std::string body = CreateApiCallBody();
   net::URLFetcher::RequestType request_type = GetRequestTypeForBody(body);
-  std::unique_ptr<URLFetcher> result =
-      net::URLFetcher::Create(0, CreateApiCallUrl(), request_type, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      CompleteNetworkTrafficAnnotation("oauth2_api_call_flow",
+                                       GetNetworkTrafficAnnotationTag(), R"(
+          policy {
+            cookies_allowed: false
+            setting: "..."
+            chrome_policy {
+              [POLICY_NAME] {
+                policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+                [POLICY_NAME]: ... //(value to disable it)
+              }
+            }
+            policy_exception_justification: "..."
+          })");
+  std::unique_ptr<URLFetcher> result = net::URLFetcher::Create(
+      0, CreateApiCallUrl(), request_type, this, traffic_annotation);

[Roger Tawa OOO till Jul 10th, 2017/05/26 13:46:10]

The annotation comes from GetNetworkTrafficAnnotationTag().  Why does it need to
be completed here?  Assuming the derived class that implements
GetNetworkTrafficAnnotationTag() has no policy controls, there are no further
policy controls here.

[Ramin Halavati, 2017/05/29 05:30:52]

At least cookies are set here. Is it OK if I remove the other parts and just
leave them for completion here? Our goal is to keep annotations as close as
possible to the code, so that they won't be left not-updated if code changes.

 
   gaia::MarkURLFetcherAsGaia(result.get());
   result->SetRequestContext(context);
   result->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                        net::LOAD_DO_NOT_SAVE_COOKIES);
   result->AddExtraRequestHeader(MakeAuthorizationHeader(access_token));
   // Fetchers are sometimes cancelled because a network change was detected,
   // especially at startup and after sign-in on ChromeOS. Retrying once should
   // be enough in those cases; let the fetcher retry up to 3 times just in case.
   // http://crbug.com/163710
   result->SetAutomaticallyRetryOnNetworkChanges(3);
 
   // Even if the the body is empty, we still set the Content-Type because an
   // empty string may be a meaningful value. For example, a Protocol Buffer
   // message with only default values will be serialized as an empty string.
   if (request_type != net::URLFetcher::GET)
     result->SetUploadData(CreateApiCallBodyContentType(), body);
 
   return result;
 }