Network traffic annotation added to OAuth2ApiCallFlow and its subclasses.

google_apis/gaia/oauth2_api_call_flow.cc

Index: google_apis/gaia/oauth2_api_call_flow.cc
diff --git a/google_apis/gaia/oauth2_api_call_flow.cc b/google_apis/gaia/oauth2_api_call_flow.cc
index e3d40f0e037e9c2a2164e764cb04bb56d758effe..0e38140b399ccdde1e8b0fa1ee1b510178bc1b74 100644
--- a/google_apis/gaia/oauth2_api_call_flow.cc
+++ b/google_apis/gaia/oauth2_api_call_flow.cc
@@ -79,8 +79,22 @@ std::unique_ptr<URLFetcher> OAuth2ApiCallFlow::CreateURLFetcher(
     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);