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

BUG=chromium-os:23871
TEST=None

Review URL: http://codereview.chromium.org/8858001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113448 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/functional/perf.py

@@ -488,15 +488,13 @@ class LiveWebappLoadTest(BasePerfTest):
     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");
@@ -1068,7 +1066,7 @@ class MemoryBloatTest(BasePerfTest):
 
       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(