Minor edits to perf.py to account for UI changes in Gmail/Calendar.

chrome/test/functional/perf.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.
 
 """Basic pyauto performance tests.
 
 For tests that need to be run for multiple iterations (e.g., so that average
 and standard deviation values can be reported), the default number of iterations
 run for each of these tests is specified by |_DEFAULT_NUM_ITERATIONS|.
@@ skipping 470 matching lines @@
 
     self._LoginToGoogleAccount()
     self._RunNewTabTest('NewTabGmail', _RunSingleGmailTabOpen)
 
   def testNewTabCalendar(self):
     """Measures time to open a tab to a logged-in Calendar account.
 
     Timing starts right before the new tab is opened, and stops as soon as the
     webpage displays the calendar print button (title 'Print my calendar').
     """
-    EXPECTED_SUBSTRING = 'Print my calendar'
+    EXPECTED_SUBSTRING = 'Month'
 
     def _DivTitleStartsWith():
       js = """
           var divs = document.getElementsByTagName("div");
           for (var i = 0; i < divs.length; ++i) {
-            if (divs[i].hasOwnProperty("dataset") &&
-                divs[i].dataset.hasOwnProperty("tooltip") &&
-                divs[i].dataset.tooltip.indexOf("%s") == 0)
+            if (divs[i].innerHTML == "%s")
               window.domAutomationController.send("true");
           }
           window.domAutomationController.send("false");
       """ % EXPECTED_SUBSTRING
       return self.ExecuteJavascript(js, tab_index=1)
 
     def _RunSingleCalendarTabOpen():
       self._AppendTab('http://calendar.google.com')
       self.assertTrue(self.WaitUntil(_DivTitleStartsWith, timeout=120,
                                      expect_retval='true', retry_sleep=0.10),
@@ skipping 551 matching lines @@
     # interactions: click the "Compose" button, enter some text into the "To"
     # field, enter some text into the "Subject" field, then click the "Discard"
     # button to discard the message.
     num_iterations = 5
     for i in xrange(num_iterations):
       logging.info('Chrome interaction iteration %d of %d.' % (
                    i + 1, num_iterations))
 
       compose_button = wait.until(lambda _: _GetElement(
                                       driver.find_element_by_xpath,
-                                      '//div[text()="Compose mail"]'))
+                                      '//div[text()="COMPOSE"]'))
       compose_button.click()
 
       to_field = wait.until(lambda _: _GetElement(
                                 driver.find_element_by_name, 'to'))
       to_field.send_keys('nobody@nowhere.com')
 
       subject_field = wait.until(lambda _: _GetElement(
                                      driver.find_element_by_name, 'subject'))
       subject_field.send_keys('This message is about to be discarded')
 
@@ skipping 388 matching lines @@
     """Identifies the port number to which the server is currently bound.
 
     Returns:
       The numeric port number to which the server is currently bound.
     """
     return self._server.server_address[1]
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()