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

media/tools/layout_tests/test_expectations_history.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.
 
 """A module for the history of the test expectation file."""
 
 from datetime import datetime
 from datetime import timedelta
 
 import re
 import sys
 import time
 import pysvn
 
 # Default Webkit SVN location for chromium test expectation file.
 # TODO(imasaki): support multiple test expectation files.
 DEFAULT_TEST_EXPECTATION_LOCATION = (
     'http://svn.webkit.org/repository/webkit/trunk/'
+    'LayoutTests/platform/chromium/TestExpectations')
+LEGACY_TEST_EXPECTATION_LOCATION = (
+    'http://svn.webkit.org/repository/webkit/trunk/'
     'LayoutTests/platform/chromium/test_expectations.txt')
 
-
 class TestExpectationsHistory(object):
   """A class to represent history of the test expectation file.
 
   The history is obtained by calling PySVN.log()/diff() APIs.
 
   TODO(imasaki): Add more functionalities here like getting some statistics
       about the test expectation file.
   """
 
   @staticmethod
@@ skipping 18 matching lines @@
       A list of tuples (old_rev, new_rev, author, date, message, lines). The
           |lines| contains the diff of the tests of interest.
     """
     # Get directory name which is necesary to call PySVN.checkout().
     te_location_dir = te_location[0:te_location.rindex('/')]
     client = pysvn.Client()
     client.checkout(te_location_dir, 'tmp', recurse=False)
     # PySVN.log() (http://pysvn.tigris.org/docs/pysvn_prog_ref.html
     # #pysvn_client_log) returns the log messages (including revision
     # number in chronological order).
-    logs = client.log('tmp/test_expectations.txt',
+    logs = client.log('tmp/TestExpectations',
                       revision_start=pysvn.Revision(
                           pysvn.opt_revision_kind.date, start),
                       revision_end=pysvn.Revision(
                           pysvn.opt_revision_kind.date, end))
     result_list = []
     gobackdays = 1
     while gobackdays < sys.maxint:
       goback_start = time.mktime(
           (datetime.fromtimestamp(start) - (
               timedelta(days=gobackdays))).timetuple())
       logs_before_time_period = (
-          client.log('tmp/test_expectations.txt',
+          client.log('tmp/TestExpectations',
                      revision_start=pysvn.Revision(
                          pysvn.opt_revision_kind.date, goback_start),
                      revision_end=pysvn.Revision(
                          pysvn.opt_revision_kind.date, start)))
       if logs_before_time_period:
         # Prepend at the beginning of logs.
         logs.insert(0, logs_before_time_period[len(logs_before_time_period)-1])
         break
       gobackdays *= 2
 
     for i in xrange(len(logs) - 1):
       old_rev = logs[i].revision.number
       new_rev = logs[i + 1].revision.number
       # Parsing the actual diff.
-      text = client.diff('/tmp', 'tmp/test_expectations.txt',
+
+      # test_expectations.txt was renamed to TestExpectations at r119317.
+      new_path = DEFAULT_TEST_EXPECTATION_LOCATION
+      if new_rev < 119317:
+        new_path = LEGACY_TEST_EXPECTATION_LOCATION
+      old_path = DEFAULT_TEST_EXPECTATION_LOCATION
+      if old_rev < 119317:
+        old_path = LEGACY_TEST_EXPECTATION_LOCATION
+
+      text = client.diff('/tmp',
+                         url_or_path=old_path,
                          revision1=pysvn.Revision(
                              pysvn.opt_revision_kind.number, old_rev),
+                         url_or_path2=new_path,
                          revision2=pysvn.Revision(
                              pysvn.opt_revision_kind.number, new_rev))
       lines = text.split('\n')
       target_lines = []
       for line in lines:
         for testname in testname_list:
           matches = re.findall(testname, line)
           if matches:
             if line[0] == '+' or line[0] == '-':
               target_lines.append(line)
       if target_lines:
         # Needs to convert to normal date string for presentation.
         result_list.append((
             old_rev, new_rev, logs[i + 1].author,
             datetime.fromtimestamp(
                 logs[i + 1].date).strftime('%Y-%m-%d %H:%M:%S'),
             logs[i + 1].message, target_lines))
     return result_list