[polymer] Merge of master into polymer10-migration

telemetry/examples/browser_tests/simple_numeric_test.py

 # Copyright 2016 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 string
 import time
 
 from telemetry.testing import serially_executed_browser_test_case
 
 
 _prev_test_name = None
 
-class SimpleTest(serially_executed_browser_test_case.SeriallyBrowserTestCase):
+class SimpleTest(
+    serially_executed_browser_test_case.SeriallyExecutedBrowserTestCase):
 
   @classmethod
   def AddCommandlineArgs(cls, parser):
     parser.add_option('--adder-sum', type=int, default=5)
 
   def setUp(self):
     self.extra = 5
 
   @classmethod
   def GenerateTestCases_AdderTest(cls, options):
@@ skipping 41 matching lines @@
 
   def MultiplierTest(self, a, b, partial_sum):
     self.assertEqual(a * b, partial_sum * self.extra)
 
   def TestSimple(self):
     time.sleep(0.5)
     self.assertEqual(1, self.extra)
 
   def TestException(self):
     raise Exception('Expected exception')