Revert 232959 "[Telemetry] Fix image_decoding_measurement timeout."

trunk/src/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py

 # Copyright 2013 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.
 import os
 import StringIO
 import unittest
 
 from telemetry.page import html_page_measurement_results
 from telemetry.page import page_set
 
@@ skipping 20 matching lines @@
 
 
 # Wrap string IO with a .name property so that it behaves more like a file.
 class StringIOFile(StringIO.StringIO):
   name = 'fake_output_file'
 
 
 class HtmlPageMeasurementResultsTest(unittest.TestCase):
 
   # TODO(tonyg): Remove this backfill when we can assume python 2.7 everywhere.
-  def assertIn(self, first, second, _=None):
+  def assertIn(self, first, second, msg=None):
     self.assertTrue(first in second,
                     msg="'%s' not found in '%s'" % (first, second))
 
   def test_basic_summary(self):
     test_page_set = _MakePageSet()
     output_file = StringIOFile()
 
     # Run the first time and verify the results are written to the HTML file.
     results = DeterministicHtmlPageMeasurementResults(
         output_file, 'test_name', False, False, 'browser_type')
@@ skipping 186 matching lines @@
                     '"important": false'
                   '}'
                 '}'
               '}'
             '}, '
             '"revision": "revision"'
           '}]'
         '</script>')
     self.assertIn(expected, output_file.getvalue())
     self.assertTrue(len(output_file.getvalue()) < last_output_len)