Add traffic annotation IDs for offline pages and downloads

Network traffic annotations are enforced in Windows, Linux. In other platforms
the annotation IDs are undefined. This leads to data use of android specific
services being bucketed to undefined bucket. This CL adds an annotation ID
for the codepath.

Bug: 762621
Change-Id: I5676680f3fb7c0f70cc1cd34ff36c898134990e7
Reviewed-on: https://chromium-review.googlesource.com/1128439Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: rajendrant <rajendrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575029}

chrome/browser/android/download/download_controller.cc

@@ -87,7 +87,8 @@ void CreateContextMenuDownload(
           web_contents->GetBrowserContext());
   std::unique_ptr<download::DownloadUrlParameters> dl_params(
       content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
-          web_contents, url, NO_TRAFFIC_ANNOTATION_YET));
+          web_contents, url,
+          TRAFFIC_ANNOTATION_WITHOUT_PROTO("Download via context menu")));
   content::Referrer referrer = content::Referrer::SanitizeForRequest(
       url,
       content::Referrer(referring_url.GetAsReferrer(), params.referrer_policy));

chrome/browser/android/omnibox/answers_image_bridge.cc

@@ -75,5 +75,5 @@ static int JNI_AnswersImage_RequestAnswersImage(
   base::android::ConvertJavaStringToUTF8(env, java_url, &url);
   return bitmap_fetcher_service->RequestImage(
       GURL(url), new AnswersImageObserverAndroid(env, java_callback),
-      NO_TRAFFIC_ANNOTATION_YET);
+      TRAFFIC_ANNOTATION_WITHOUT_PROTO("Omnibox answers image"));
 }

chrome/browser/android/webapk/webapk_icon_hasher.cc

@@ -87,7 +87,8 @@ WebApkIconHasher::WebApkIconHasher(
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = icon_url;
   simple_url_loader_ = network::SimpleURLLoader::Create(
-      std::move(resource_request), NO_TRAFFIC_ANNOTATION_YET);
+      std::move(resource_request),
+      TRAFFIC_ANNOTATION_WITHOUT_PROTO("webapk icon hasher"));
   simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
       url_loader_factory,
       base::BindOnce(&WebApkIconHasher::OnSimpleLoaderComplete,

chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc

@@ -237,7 +237,8 @@ void DownloadAsFile(content::WebContents* web_contents, const GURL& url) {
       web_contents->GetBrowserContext());
   std::unique_ptr<download::DownloadUrlParameters> dl_params(
       content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
-          web_contents, url, NO_TRAFFIC_ANNOTATION_YET));
+          web_contents, url,
+          TRAFFIC_ANNOTATION_WITHOUT_PROTO("Offline pages download file")));
 
   content::NavigationEntry* entry =
       web_contents->GetController().GetLastCommittedEntry();

net/traffic_annotation/network_traffic_annotation.h

@@ -6,6 +6,7 @@
 #define NET_TRAFFIC_ANNOTATION_NETWORK_TRAFFIC_ANNOTATION_H_
 
 #include "base/logging.h"
+#include "build/build_config.h"
 
 namespace {
 
@@ -291,6 +292,11 @@ struct MutablePartialNetworkTrafficAnnotationTag {
 }  // namespace net
 
 // Placeholder for unannotated usages.
+#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
+  net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
+#endif
+
 #define NO_TRAFFIC_ANNOTATION_YET \
   net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")