Revert "Remove journey_journey_info_json_request network annotation"

This reverts commit 706b39eb.

Reason for revert: broke check_network_annotations on CQ and didn't fix the underlying issue.

Original change's description:
> Remove journey_journey_info_json_request network annotation
> 
> Bug: 909867
> Change-Id: I8d910acd2b5adf3686678ef186318cc4dc4fe118
> Reviewed-on: https://chromium-review.googlesource.com/c/1355772
> Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
> Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
> Commit-Queue: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#612653}

TBR=yusufo@chromium.org,rhalavati@chromium.org,meiliang@chromium.org,nicolaso@chromium.org

Change-Id: If75c9709ad6d81e9c4f5576b89f91b6af66fe4f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 909867
Reviewed-on: https://chromium-review.googlesource.com/c/1357215Reviewed-by: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Commit-Queue: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612740}

components/journey/journey_info_json_request.cc

@@ -151,6 +151,31 @@ JourneyInfoJsonRequest::Builder::BuildSimpleURLLoaderHeaders() const {
 
 std::unique_ptr<network::SimpleURLLoader>
 JourneyInfoJsonRequest::Builder::BuildSimpleURLLoader() const {
+  // TODO(meiliang): update the policy section with correct setting and
+  // chrome_policy
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("journey_journey_info_json_request",
+                                          R"(
+        semantics {
+          sender: "Journey info Json request"
+          description:
+            "Chromium can show a list of pages that are related to currently "
+            "visited page."
+          trigger:
+            "Triggered at every tab selection, and every 30s has passed since "
+            "the last request for that journey if there is already a journey "
+            "to match to the tab."
+          data:
+            "Only white-listed signed-in test user's OAuth2 credentials,"
+            "the task_id or the timestamps of the current tab."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: NO
+          setting: "None."
+          chrome_policy {}
+        })");
+
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = GURL(url_);
   resource_request->load_flags =
@@ -159,7 +184,7 @@ JourneyInfoJsonRequest::Builder::BuildSimpleURLLoader() const {
   resource_request->method = "POST";
 
   auto simple_loader = network::SimpleURLLoader::Create(
-      std::move(resource_request), NO_TRAFFIC_ANNOTATION_YET);
+      std::move(resource_request), traffic_annotation);
   simple_loader->SetAllowHttpErrorResults(true);
   simple_loader->AttachStringForUpload(body_,
                                        "application/json; charset=UTF-8");

tools/traffic_annotation/summary/annotations.xml

@@ -141,6 +141,7 @@ Refer to README.md for content description and update process.
  <item id="interest_feed_send" hash_code="76717919" type="0" content_hash_code="34678180" os_list="linux,windows" file_path="components/feed/core/feed_networking_host.cc"/>
  <item id="intranet_redirect_detector" hash_code="21785164" type="0" content_hash_code="62025595" os_list="linux,windows" file_path="chrome/browser/intranet_redirect_detector.cc"/>
  <item id="invalidation_service" hash_code="72354423" type="0" content_hash_code="78425687" os_list="linux,windows" file_path="components/invalidation/impl/gcm_network_channel.cc"/>
+ <item id="journey_journey_info_json_request" hash_code="62660788" type="0" content_hash_code="77009071" os_list="linux,windows" file_path="components/journey/journey_info_json_request.cc"/>
  <item id="lib_address_input" hash_code="50816767" type="0" content_hash_code="57977576" os_list="linux,windows" file_path="third_party/libaddressinput/chromium/chrome_metadata_source.cc"/>
  <item id="logo_tracker" hash_code="36859107" type="0" content_hash_code="67588075" os_list="linux,windows" file_path="components/search_provider_logos/logo_tracker.cc"/>
  <item id="md_downloads_dom_handler" hash_code="65603364" type="0" content_hash_code="134779147" os_list="linux,windows" file_path="chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc"/>