Update traffic_annotation_auditor's safe list processing.

A minor bug in processing safe list in traffic annotation auditor is
fixed.

Bug: 690323
Change-Id: I76f6d023f88106bf69b6c5546142afb52e8e37c5
Reviewed-on: https://chromium-review.googlesource.com/1054877
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Georges Khalil <georgesak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558206}

tools/traffic_annotation/auditor/traffic_annotation_auditor.cc

@@ -441,26 +441,23 @@ bool TrafficAnnotationAuditor::ParseClangToolRawOutput() {
     if (block_type == "ANNOTATION") {
       AnnotationInstance new_annotation;
       result = new_annotation.Deserialize(lines, current, end_line);
-      result.set_file_path(
-          MakeRelativePath(absolute_source_path_, result.file_path()));
-      if (IsSafeListed(result.file_path(),
-                       AuditorException::ExceptionType::ALL)) {
+      std::string file_path = result.IsOK()
+                                  ? new_annotation.proto.source().file()
+                                  : result.file_path();
+      file_path = MakeRelativePath(absolute_source_path_, file_path);
+      if (IsSafeListed(file_path, AuditorException::ExceptionType::ALL))
         result = AuditorResult(AuditorResult::Type::RESULT_IGNORE);
-      }
       switch (result.type()) {
         case AuditorResult::Type::RESULT_OK:
-          new_annotation.proto.mutable_source()->set_file(MakeRelativePath(
-              absolute_source_path_, new_annotation.proto.source().file()));
+          new_annotation.proto.mutable_source()->set_file(file_path);
           extracted_annotations_.push_back(new_annotation);
           break;
         case AuditorResult::Type::ERROR_MISSING_TAG_USED:
-          if (IsSafeListed(result.file_path(),
-                           AuditorException::ExceptionType::MISSING)) {
+          if (IsSafeListed(file_path, AuditorException::ExceptionType::MISSING))
             result = AuditorResult(AuditorResult::Type::RESULT_IGNORE);
-          }
           break;
         case AuditorResult::Type::ERROR_TEST_ANNOTATION:
-          if (IsSafeListed(result.file_path(),
+          if (IsSafeListed(file_path,
                            AuditorException::ExceptionType::TEST_ANNOTATION)) {
             result = AuditorResult(AuditorResult::Type::RESULT_IGNORE);
           }

tools/traffic_annotation/bin/README.md

@@ -73,4 +73,5 @@ and land the resulting CL.
 The following two lines will be updated by the above script, and the modified
 README should be committed along with the updated .sha1 checksums.
 
-LASTCHANGE=571f573076431cc3c8c13da2d9b37841aee2d783-refs/heads/master@{#556683}
+CLANG_REVISION = '331747'
+LASTCHANGE=5ebfed4cb2784625cbcccb588dc7e7bd9c87c9eb-refs/heads/master@{#557822}

tools/traffic_annotation/bin/linux64/traffic_annotation_auditor.sha1

-5b26993a9fd2dcb3898ff7a28a35243cb13e9455
\ No newline at end of file
+171bcdfa3a8354d517eaad35da26eb6750392c13
\ No newline at end of file