Partial network traffic annotation check for tests updated.

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 97 matching lines @@
 // This function can be used to define a completing partial annotation. This
 // annotation adds details to another annotation that is defined before.
 // |partial_annotation| is the PartialNetworkTrafficAnnotationTag returned
 // by a call to DefinePartialNetworkTrafficAnnotation().
 template <size_t N1, size_t N2>
 NetworkTrafficAnnotationTag CompleteNetworkTrafficAnnotation(
     const char (&unique_id)[N1],
     const PartialNetworkTrafficAnnotationTag& partial_annotation,
     const char (&proto)[N2]) {
 #if defined(_DEBUG) || defined(DCHECK_ALWAYS_ON)
-  DCHECK_EQ(COMPUTE_STRING_HASH(unique_id),
-            partial_annotation.completing_id_hash_code);
+  DCHECK(partial_annotation.completing_id_hash_code ==
+             COMPUTE_STRING_HASH(unique_id) ||
+         partial_annotation.unique_id_hash_code ==
+             COMPUTE_STRING_HASH("test_partial"));
 #endif
   return NetworkTrafficAnnotationTag({partial_annotation.unique_id_hash_code});
 }
 
 // This function can be used to define a completing partial annotation that is
 // branched into several annotations. In this case, |group_id| is a common id
 // that is used by all members of the branch and referenced by partial
 // annotation that is completed by them.
 template <size_t N1, size_t N2, size_t N3>
 NetworkTrafficAnnotationTag BranchedCompleteNetworkTrafficAnnotation(
     const char (&unique_id)[N1],
     const char (&group_id)[N2],
     const PartialNetworkTrafficAnnotationTag& partial_annotation,
     const char (&proto)[N3]) {
 #if defined(_DEBUG) || defined(DCHECK_ALWAYS_ON)
-  DCHECK_EQ(COMPUTE_STRING_HASH(group_id),
-            partial_annotation.completing_id_hash_code);
+  DCHECK(partial_annotation.completing_id_hash_code ==
+             COMPUTE_STRING_HASH(unique_id) ||
+         partial_annotation.unique_id_hash_code ==
+             COMPUTE_STRING_HASH("test_partial"));
 #endif
   return NetworkTrafficAnnotationTag({COMPUTE_STRING_HASH(unique_id)});
 }
 
 // Example for joining N x 1 partial annotations:
 // N functions foo1(), ..., fooN() call one function bar(). Each
 // foo...() function defines part of a network traffic annotation.
 // These N partial annotations are combined with a second part in
 // bar().
 //
@@ skipping 45 matching lines @@
 #define NO_TRAFFIC_ANNOTATION_YET \
   net::DefineNetworkTrafficAnnotation("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_