Network traffic annotation added to URLLoaderImpl.

net/traffic_annotation/network_traffic_annotation.h

 // Copyright 2017 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.
 
 #ifndef NET_TRAFFIC_ANNOTATION_NETWORK_TRAFFIC_ANNOTATION_H_
 #define NET_TRAFFIC_ANNOTATION_NETWORK_TRAFFIC_ANNOTATION_H_
 
 #include "base/logging.h"
 
 namespace {
@@ skipping 176 matching lines @@
 //     // final_tag is hash code of "call_bool_branch_1".
 //     net::URLFetcher::Create(url1, ..., final_tag);
 //   } else {
 //     auto final_tag = BranchedCompleteNetworkTrafficAnnotation(
 //       "call_bool_branch_2", "completion_by_bar", tag, [rest_of_proto]);
 //     // final_tag is hash code of "call_bool_branch_2".
 //     net::URLFetcher::Create(url2, ..., final_tag);
 //   }
 // }
 
+#define TRAFFIC_ANNOTATION_UNINITIALIZED -1
+
+// Do not use this unless net-serialization is required.
+// TODO(crbug.com/690323): Add tools to check constructor of this structure is
+// used only in .mojom.cc files.
+struct MutableNetworkTrafficAnnotationTag {
+  MutableNetworkTrafficAnnotationTag()
+      : unique_id_hash_code(TRAFFIC_ANNOTATION_UNINITIALIZED) {}
+  MutableNetworkTrafficAnnotationTag(

[battre, 2017/06/01 12:36:36]

explicit MutableNetworkTrafficAnnotationTag

same below

[Ramin Halavati, 2017/06/01 13:14:27]

Done.

+      const NetworkTrafficAnnotationTag& traffic_annotation)
+      : unique_id_hash_code(traffic_annotation.unique_id_hash_code) {}
+  int32_t unique_id_hash_code = TRAFFIC_ANNOTATION_UNINITIALIZED;

[battre, 2017/06/01 12:36:36]

isn't this default value duplicative given the constructor?

[Ramin Halavati, 2017/06/01 13:14:27]

Done.

+
+  explicit operator NetworkTrafficAnnotationTag() const {
+    return NetworkTrafficAnnotationTag({unique_id_hash_code});
+  }
+};
+
+struct MutablePartialNetworkTrafficAnnotationTag {
+#if defined(_DEBUG) || defined(DCHECK_ALWAYS_ON)
+  MutablePartialNetworkTrafficAnnotationTag()
+      : unique_id_hash_code(TRAFFIC_ANNOTATION_UNINITIALIZED),
+        completing_id_hash_code(TRAFFIC_ANNOTATION_UNINITIALIZED) {}
+  MutablePartialNetworkTrafficAnnotationTag(
+      const PartialNetworkTrafficAnnotationTag& partial_traffic_annotation)
+      : unique_id_hash_code(partial_traffic_annotation.unique_id_hash_code),
+        completing_id_hash_code(
+            partial_traffic_annotation.completing_id_hash_code) {}
+  int32_t unique_id_hash_code = TRAFFIC_ANNOTATION_UNINITIALIZED;
+  int32_t completing_id_hash_code = TRAFFIC_ANNOTATION_UNINITIALIZED;
+
+  explicit operator PartialNetworkTrafficAnnotationTag() const {
+    return PartialNetworkTrafficAnnotationTag(
+        {unique_id_hash_code, completing_id_hash_code});
+  }
+#else
+  MutablePartialNetworkTrafficAnnotationTag()
+      : unique_id_hash_code(TRAFFIC_ANNOTATION_UNINITIALIZED) {}
+  MutablePartialNetworkTrafficAnnotationTag(
+      const PartialNetworkTrafficAnnotationTag& partial_traffic_annotation)
+      : unique_id_hash_code(partial_traffic_annotation.unique_id_hash_code) {}
+  int32_t unique_id_hash_code = TRAFFIC_ANNOTATION_UNINITIALIZED;
+
+  explicit operator PartialNetworkTrafficAnnotationTag() const {
+    return PartialNetworkTrafficAnnotationTag({unique_id_hash_code});
+  }
+#endif  // defined(_DEBUG) || defined(DCHECK_ALWAYS_ON)
+};
+
 }  // namespace net
 
 // Placeholder for unannotated usages.
 #define NO_TRAFFIC_ANNOTATION_YET \
   net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")
 
 #define NO_PARTIAL_TRAFFIC_ANNOTATION_YET                              \
   net::DefinePartialNetworkTrafficAnnotation("undefined", "undefined", \
                                              "Nothing here yet.")
 
 #define MISSING_TRAFFIC_ANNOTATION     \
   net::DefineNetworkTrafficAnnotation( \
       "missing", "Function called without traffic annotation.")
 
 #undef COMPUTE_STRING_HASH
 
 #endif  // NET_TRAFFIC_ANNOTATION_NETWORK_TRAFFIC_ANNOTATION_H_