Remove NO_TRAFFIC_ANNOTATION_BUG_656607 temporary annotation.

All usages of NO_TRAFFIC_ANNOTAITON_BUG_656607 temporary annotation are
replaced with actual annotations and this tag can be removed.

Bug: 656607
Change-Id: If38d15152cbaa3df79d4d9b4d8146d0ca9119a39
Reviewed-on: https://chromium-review.googlesource.com/960083
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Helen Li <xunjieli@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543846}

net/traffic_annotation/network_traffic_annotation.h

@@ -298,12 +298,6 @@ struct MutablePartialNetworkTrafficAnnotationTag {
   net::DefineNetworkTrafficAnnotation( \
       "missing", "Function called without traffic annotation.")
 
-// TODO(crbug.com/656607): Remove this temporary tag which is only used during
-// refactoring.
-#define NO_TRAFFIC_ANNOTATION_BUG_656607                  \
-  net::DefineNetworkTrafficAnnotation("undefined-656607", \
-                                      "Temporary tag for crbug.com/656607.")
-
 #undef COMPUTE_STRING_HASH
 
 #endif  // NET_TRAFFIC_ANNOTATION_NETWORK_TRAFFIC_ANNOTATION_H_

tools/traffic_annotation/README.md

@@ -98,4 +98,4 @@ and cc the people listed in OWNERS; they'll be on the hook to rebuild and
 re-enable the test.
 
 CLANG_REVISION = '325667'
-LASTCHANGE=8cc080c600411c8c439b806804d4e035b8444650-refs/heads/master@{#543652}
+LASTCHANGE=0b5b8baa3baf14eaebe56cb3642a016bcfa26e8f-refs/heads/master@{#543662}

tools/traffic_annotation/auditor/instance.cc

@@ -181,13 +181,6 @@ AuditorResult AnnotationInstance::Deserialize(
     return AuditorResult(AuditorResult::Type::ERROR_MISSING_TAG_USED, "",
                          file_path, line_number);
 
-  // TODO(crbug.com/656607): Remove this test.
-  // Process temporary tag.
-  if (unique_id_hash_code ==
-      NO_TRAFFIC_ANNOTATION_BUG_656607.unique_id_hash_code) {
-    return AuditorResult(AuditorResult::Type::RESULT_IGNORE);
-  }
-
   // Decode serialized proto.
   std::string annotation_text = "";
   while (start_line < end_line) {

tools/traffic_annotation/auditor/traffic_annotation_auditor.cc

@@ -37,8 +37,7 @@ std::map<int, std::string> kReservedAnnotations = {
     {TRAFFIC_ANNOTATION_FOR_TESTS.unique_id_hash_code, "test"},
     {PARTIAL_TRAFFIC_ANNOTATION_FOR_TESTS.unique_id_hash_code, "test_partial"},
     {NO_TRAFFIC_ANNOTATION_YET.unique_id_hash_code, "undefined"},
-    {MISSING_TRAFFIC_ANNOTATION.unique_id_hash_code, "missing"},
-    {NO_TRAFFIC_ANNOTATION_BUG_656607.unique_id_hash_code, "undefined-656607"}};
+    {MISSING_TRAFFIC_ANNOTATION.unique_id_hash_code, "missing"}};
 
 struct AnnotationID {
   // Two ids can be the same in the following cases:

tools/traffic_annotation/auditor/traffic_annotation_auditor_unittest.cc

@@ -404,8 +404,7 @@ TEST_F(TrafficAnnotationAuditorTest, GetReservedIDsCoverage) {
       PARTIAL_TRAFFIC_ANNOTATION_FOR_TESTS.unique_id_hash_code,
       NO_TRAFFIC_ANNOTATION_YET.unique_id_hash_code,
       NO_PARTIAL_TRAFFIC_ANNOTATION_YET.unique_id_hash_code,
-      MISSING_TRAFFIC_ANNOTATION.unique_id_hash_code,
-      NO_TRAFFIC_ANNOTATION_BUG_656607.unique_id_hash_code};
+      MISSING_TRAFFIC_ANNOTATION.unique_id_hash_code};
 
   std::map<int, std::string> reserved_words =
       TrafficAnnotationAuditor::GetReservedIDsMap();

tools/traffic_annotation/bin/linux64/traffic_annotation_auditor.sha1

-07a0ebcf5b95c08b2d18f7b72fd4746818b6e2ae
\ No newline at end of file
+205be9158712dc4bdc696c4a9b38fe35bd057c6a
\ No newline at end of file

tools/traffic_annotation/bin/win32/traffic_annotation_auditor.exe.sha1

-1046e90d6c95711c058bc13b46dcc6e47072a282
\ No newline at end of file
+564e443e59532049ad4d448b9b366d55338328c7
\ No newline at end of file

tools/traffic_annotation/summary/annotations.xml

@@ -244,7 +244,6 @@ Refer to README.md for content description and update process.
  <item id="translate_url_fetcher" hash_code="137116619" type="0" content_hash_code="104217506" os_list="linux,windows" file_path="components/translate/core/browser/translate_url_fetcher.cc"/>
  <item id="ui_devtools_server" hash_code="4986170" type="0" content_hash_code="62670263" os_list="linux,windows" file_path="components/ui_devtools/devtools_server.cc"/>
  <item id="undefined" hash_code="45578882" type="0" reserved="1" os_list="linux,windows" file_path=""/>
- <item id="undefined-656607" hash_code="28406789" type="0" reserved="1" os_list="linux,windows" file_path=""/>
  <item id="url_fetcher_downloader" hash_code="113231892" type="0" content_hash_code="61085066" os_list="linux,windows" file_path="components/update_client/url_fetcher_downloader.cc"/>
  <item id="url_prevision_fetcher" hash_code="118389509" type="0" content_hash_code="66145513" os_list="linux,windows" file_path="content/browser/media/url_provision_fetcher.cc"/>
  <item id="user_info_fetcher" hash_code="22265491" type="0" content_hash_code="72016232" os_list="linux,windows" file_path="components/policy/core/common/cloud/user_info_fetcher.cc"/>