Revert of Tweak output of (memcheck|drmemory)_analyze.py.

tools/valgrind/drmemory_analyze.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 # drmemory_analyze.py
 
 ''' Given a Dr. Memory output file, parses errors and uniques them.'''
 
 from collections import defaultdict
@@ skipping 22 matching lines @@
         supp_lines[l] = "name=<insert_a_suppression_name_here>"
       if supp_lines[l].startswith("chrome.dll!"):
         supp_lines[l] = supp_lines[l].replace("chrome.dll!", "*!")
       bang_index = supp_lines[l].find("!")
       d_exe_index = supp_lines[l].find(".exe!")
       if bang_index >= 4 and d_exe_index + 4 == bang_index:
         supp_lines[l] = "*" + supp_lines[l][bang_index:]
     self._suppression = "\n".join(supp_lines)
 
   def __str__(self):
-    output = ""
-    output += "### BEGIN MEMORY TOOL REPORT (error hash=#%016X#)\n" %
-        self.ErrorHash()
-    output += self._report + "\n"
+    output = self._report + "\n"
     if self._testcase:
       output += "The report came from the `%s` test.\n" % self._testcase
     output += "Suppression (error hash=#%016X#):\n" % self.ErrorHash()
     output += ("  For more info on using suppressions see "
         "http://dev.chromium.org/developers/how-tos/using-drmemory#TOC-Suppressing-error-reports-from-the-\n")
     output += "{\n%s\n}\n" % self._suppression
-    output += "### END MEMORY TOOL REPORT (error hash=#%016X#)\n" %
-        self.ErrorHash()
     return output
 
   # This is a device-independent hash identifying the suppression.
   # By printing out this hash we can find duplicate reports between tests and
   # different shards running on multiple buildbots
   def ErrorHash(self):
     return int(hashlib.md5(self._suppression).hexdigest()[:16], 16)
 
   def __hash__(self):
     return hash(self._suppression)
@@ skipping 128 matching lines @@
   if len(args) == 0:
     parser.error("no filename specified")
   filenames = args
 
   logging.getLogger().setLevel(logging.INFO)
   return DrMemoryAnalyzer().Report(filenames, None, False)
 
 
 if __name__ == '__main__':
   sys.exit(main())