Update layout_tests tool in media/tools and PRESUBMIT.py per test_expectations.txt renames.

media/tools/layout_tests/layouttest_analyzer_helpers.py

 # Copyright (c) 2012 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.
 
 """Helper functions for the layout test analyzer."""
 
 from datetime import datetime
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 import fileinput
 import os
 import pickle
 import re
 import smtplib
 import socket
 import sys
 import time
 import urllib
 
 from bug import Bug
 from test_expectations_history import TestExpectationsHistory
 
+DEFAULT_TEST_EXPECTATION_PATH = ('trunk/LayoutTests/platform/chromium/'
+    'TestExpectations')
+LEGACY_DEFAULT_TEST_EXPECTATION_PATH = ('trunk/LayoutTests/platform/chromium/'
+    'test_expectations.txt')
 
 class AnalyzerResultMap:
   """A class to deal with joined result produed by the analyzer.
 
   The join is done between layouttests and the test_expectations object
   (based on the test expectation file). The instance variable |result_map|
   contains the following keys: 'whole','skip','nonskip'. The value of 'whole'
   contains information about all layouttests. The value of 'skip' contains
   information about skipped layouttests where it has 'SKIP' in its entry in
   the test expectation file. The value of 'nonskip' contains all information
@@ skipping 365 matching lines @@
   rev_str = ''
   simple_rev_str = ''
   rev = ''
   rev_date = ''
   if rev_infos:
     # Get latest revision number and date.
     rev = rev_infos[-1][1]
     rev_date = rev_infos[-1][3]
     for rev_info in rev_infos:
       (old_rev, new_rev, author, date, _, target_lines) = rev_info
-      link = urllib.unquote('http://trac.webkit.org/changeset?new=%d%40trunk'
-                            '%2FLayoutTests%2Fplatform%2Fchromium%2F'
-                            'test_expectations.txt&old=%d%40trunk%2F'
-                            'LayoutTests%2Fplatform%2Fchromium%2F'
-                            'test_expectations.txt') % (new_rev, old_rev)
+
+      # test_expectations.txt was renamed to TestExpectations at r119317.
+      new_path = DEFAULT_TEST_EXPECTATION_PATH
+      if new_rev < 119317:
+        new_path = LEGACY_DEFAULT_TEST_EXPECTATION_PATH
+      old_path = DEFAULT_TEST_EXPECTATION_PATH
+      if old_rev < 119317:
+        old_path = LEGACY_DEFAULT_TEST_EXPECTATION_PATH
+
+      link = 'http://trac.webkit.org/changeset?new=%d@%s&old=%d@%s' % (new_rev,
+          new_path, old_rev, old_path)
       rev_str += '<ul><a href="%s">%s->%s</a>\n' % (link, old_rev, new_rev)
       simple_rev_str = '<a href="%s">%s->%s</a>,' % (link, old_rev, new_rev)
       rev_str += '<li>%s</li>\n' % author
       rev_str += '<li>%s</li>\n<ul>' % date
       for line in target_lines:
         # Find *.html pattern (test name) and replace it with the link to
         # flakiness dashboard.
         test_name_pattern = r'(\S+.html)'
         match = re.search(test_name_pattern, line)
         if match:
@@ skipping 157 matching lines @@
           list2 = map2[name]['te_info']
           te_diff = [item for item in list1 if not item in list2]
           if te_diff:
             name_list.append((name, te_diff))
       else:
         name_list.append((name, value1))
     return name_list
 
   return (GetDiffBetweenMapsHelper(map1, map2, lookIntoTestExpectationInfo),
           GetDiffBetweenMapsHelper(map2, map1, lookIntoTestExpectationInfo))