Removing Page.WaitToLoad and update all pagesets to use explicit wait actions

BUG=273845

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=219675

Review URL: https://chromiumcodereview.appspot.com/22883011

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

11 files changed, 265 insertions, 310 deletions

diff --git a/tools/perf/page_sets/2012Q3.json b/tools/perf/page_sets/2012Q3.json
index 151a1d6..777d5db 100644
--- a/tools/perf/page_sets/2012Q3.json
+++ b/tools/perf/page_sets/2012Q3.json
@@ -3,7 +3,11 @@
   "archive_data_file": "../data/2012Q3.json",
   "credentials_path": "../data/credentials.json",
   "smoothness": { "action": "scroll" },
-  "reload_and_gc": [{"action": "reload", "wait_seconds": 1}, {"action": "js_collect_garbage"}],
+  "reload_and_gc": [
+    {"action": "reload" },
+    {"action": "wait", "seconds": 1 },
+    {"action": "js_collect_garbage" }
+  ],
   "stress_memory": { "action": "reload_and_gc", "repeat": 3 },
   "pages": [
     { "url": "http://www.facebook.com/barackobama" },
diff --git a/tools/perf/page_sets/calendar_forward_backward.json b/tools/perf/page_sets/calendar_forward_backward.json
index 7e5257f..5b72a25 100644
--- a/tools/perf/page_sets/calendar_forward_backward.json
+++ b/tools/perf/page_sets/calendar_forward_backward.json
@@ -8,58 +8,29 @@
       "url": "https://www.google.com/calendar/",
       "why": "Click forward(4x) and backwards(4x) repeatedly",
       "credentials": "google",
-      "wait_for_element_with_selector": "div[class~=\"navForward\"]",
-      "post_navigate_javascript_to_execute": "(function() { var elem = document.createElement('meta');elem.name='viewport';elem.content='initial-scale=1';document.body.appendChild(elem); })();",
-      "wait_seconds": 2,
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector":  "div[class~=\"navForward\"]" },
+        { "action": "javascript", "expression": "(function() { var elem = document.createElement('meta');elem.name='viewport';elem.content='initial-scale=1';document.body.appendChild(elem); })();" }
+      ],
       "endure": [
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        }
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" }
       ]
     }
   ]
diff --git a/tools/perf/page_sets/image_decoding_measurement.json b/tools/perf/page_sets/image_decoding_measurement.json
index fcf1ce2..cfe6ff7 100644
--- a/tools/perf/page_sets/image_decoding_measurement.json
+++ b/tools/perf/page_sets/image_decoding_measurement.json
@@ -1,7 +1,10 @@
 {
   "description": "A directed benchmark of image decoding performance",
-  "post_navigate_javascript_to_execute": "runBenchmark();",
-  "wait_for_javascript_expression": "isDone",
+  "navigate_steps": [
+    { "action": "navigate" },
+    { "action": "javascript", "expression": "runBenchmark();" },
+    { "action": "wait", "javascript": "isDone" }
+  ],
   "image_decoding_measurement_limit_results_to_min_iterations": true,
   "pages": [
     { "url": "file:///../../../chrome/test/data/image_decoding/image_decoding.html?gif" },
diff --git a/tools/perf/page_sets/key_desktop_sites.json b/tools/perf/page_sets/key_desktop_sites.json
index 85b05e8..69613a2 100644
--- a/tools/perf/page_sets/key_desktop_sites.json
+++ b/tools/perf/page_sets/key_desktop_sites.json
@@ -620,10 +620,10 @@
       "url": "https://mail.google.com/mail/",
       "credentials": "google",
       "scrollable_element_function": "function(callback) { gmonkey.load('2.0', function(api) { callback(api.getScrollableElement()); }); }",
-      "smoothness": {
-        "action": "scroll",
-        "wait_for_javascript_expression": "window.gmonkey !== undefined && document.getElementById('gb') !== null"
-      }
+      "smoothness": [
+        { "action": "scroll" },
+        { "action": "wait", "javascript": "window.gmonkey !== undefined && document.getElementById('gb') !== null" }
+      ]
     },
     {
       "url": "https://www.google.com/calendar/",
@@ -634,19 +634,19 @@
       "url": "https://drive.google.com",
       "credentials": "google",
       "scrollable_element_function": "function(callback) { callback(document.getElementsByClassName('doclistview-list')[0]); }",
-      "smoothness": {
-        "action": "scroll",
-        "wait_for_javascript_expression": "document.getElementsByClassName('doclistview-list').length"
-      }
+      "smoothness": [
+        { "action": "scroll" },
+        { "action": "wait", "javascript": "document.getElementsByClassName('doclistview-list').length" }
+      ]
     },
     {
       "url": "https://docs.google.com/a/google.com/document/d/1XMAtPiVFZfItsMUOYl39v5YA8bcSPe4LDrVO25OdsCU/edit",
       "credentials": "google",
       "scrollable_element_function": "function(callback) { callback(document.getElementsByClassName('kix-appview-editor')[0]); }",
-      "smoothness": {
-        "action": "scroll",
-        "wait_for_javascript_expression": "document.getElementsByClassName('kix-appview-editor').length"
-      }
+      "smoothness": [
+        { "action": "scroll" },
+        { "action": "wait", "javascript": "document.getElementsByClassName('kix-appview-editor').length" }
+      ]
     },
     { "url": "https://maps.google.com" },
     { "url": "http://reader.google.com" },
diff --git a/tools/perf/page_sets/key_mobile_sites.json b/tools/perf/page_sets/key_mobile_sites.json
index 3c2cc6b..afc436c 100644
--- a/tools/perf/page_sets/key_mobile_sites.json
+++ b/tools/perf/page_sets/key_mobile_sites.json
@@ -16,7 +16,10 @@
     {
       "url": "http://iphone.capitolvolkswagen.com/index.htm#new-inventory_p_2Fsb-new_p_2Ehtm_p_3Freset_p_3DInventoryListing",
       "why": "Typical mobile business site",
-      "wait_for_element_with_text": "Next 35"
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Next 35" }
+      ]
     },
     {
       "url": "http://gsp.ro",
@@ -33,12 +36,18 @@
     {
       "url": "http://www.theverge.com/2012/10/28/3568746/amazon-7-inch-fire-hd-ipad-mini-ad-ballsy",
       "why": "Top tech blog",
-      "wait_for_javascript_expression": "window.Chorus !== undefined && window.Chorus.Comments !== undefined && window.Chorus.Comments.Json !== undefined && (window.Chorus.Comments.loaded || window.Chorus.Comments.Json.load_comments())"
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "wait", "javascript": "window.Chorus !== undefined && window.Chorus.Comments !== undefined && window.Chorus.Comments.Json !== undefined && (window.Chorus.Comments.loaded || window.Chorus.Comments.Json.load_comments())" }
+      ]
     },
     {
       "url": "http://www.cnn.com/2012/10/03/politics/michelle-obama-debate/index.html",
       "why": "Top news site",
-      "wait_seconds": 8
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 8 }
+      ]
     },
     {
       "url": "http://digg.com",
@@ -59,12 +68,18 @@
     {
       "url": "https://facebook.com/barackobama",
       "why": "#1 (Alexa global)",
-      "wait_for_javascript_expression": "document.getElementById('timelineBody') !== null"
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "wait", "javascript": "document.getElementById('timelineBody') !== null" }
+      ]
     },
     {
       "url": "http://m.youtube.com/watch?v=9hBpF_Zj4OA",
       "why": "#3 (Alexa global)",
-      "wait_for_javascript_expression": "document.getElementById('paginatortarget') !== null"
+      "navigate_steps": [
+        { "action": "navigate"},
+        { "action": "wait", "javascript": "document.getElementById('paginatortarget') !== null"}
+      ]
     },
     {
       "name": "Blogger",
@@ -80,8 +95,11 @@
       "name": "LinkedIn",
       "url": "https://www.linkedin.com/in/linustorvalds",
       "why": "#12 (Alexa global),Public profile",
-      "post_navigate_javascript_to_execute": "getAppJs.noApp();",
-      "wait_for_javascript_expression": "document.getElementById('profile-view-scroller') !== null"
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "javascript", "expression": "getAppJs.noApp();" },
+        { "action": "wait", "javascript": "document.getElementById('profile-view-scroller') !== null" }
+      ]
     },
     {
       "name": "Wikipedia (1 tab)",
@@ -141,7 +159,10 @@
       "url": "https://mail.google.com/mail/",
       "why": "productivity, top google properties",
       "credentials": "google",
-      "wait_for_element_with_text": "Inbox",
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Inbox" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scrollable_element_function": "function(callback) { callback(document.getElementById('views').childNodes[1].firstChild); }"
@@ -194,8 +215,11 @@
     {
       "url": "http://groupcloned.com",
       "why": "crbug.com/172906",
-      "wait_for_javascript_expression": "document.getElementById('element-19') !== null && document.getElementById('element-19').contentDocument.getElementById('element-22') !== null && document.getElementById('element-19').contentDocument.getElementsByClassName('container list-item gc-list-item stretched').length !== 0",
-      "wait_seconds": 5,
+      "navigate_steps": [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 5 },
+        { "action": "wait", "javascript": "document.getElementById('element-19') !== null && document.getElementById('element-19').contentDocument.getElementById('element-22') !== null && document.getElementById('element-19').contentDocument.getElementsByClassName('container list-item gc-list-item stretched').length !== 0" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scroll_requires_touch": true,
diff --git a/tools/perf/page_sets/mobile_memory.json b/tools/perf/page_sets/mobile_memory.json
index 57884749..b9e65a7 100644
--- a/tools/perf/page_sets/mobile_memory.json
+++ b/tools/perf/page_sets/mobile_memory.json
@@ -3,7 +3,11 @@
   "archive_data_file": "../data/mobile_memory.json",
   "credentials_path": "../data/credentials.json",
   "user_agent_type": "mobile",
-  "reload_and_gc": [{"action": "reload", "wait_seconds": 15}, {"action": "js_collect_garbage"}],
+  "reload_and_gc": [
+    {"action": "reload" },
+    {"action": "wait", "seconds": 15 },
+    {"action": "js_collect_garbage" }
+  ],
   "stress_memory": { "action": "reload_and_gc", "repeat": 3 },
   "pages": [
     {
diff --git a/tools/perf/page_sets/pica.json b/tools/perf/page_sets/pica.json
index 2315276..11527f6 100644
--- a/tools/perf/page_sets/pica.json
+++ b/tools/perf/page_sets/pica.json
@@ -5,7 +5,10 @@
     { "url": "http://www.polymer-project.org/polymer-all/projects/pica/index.html",
       "script_to_evaluate_on_commit":
           "document.addEventListener('WebComponentsReady', function(){var unused = document.body.offsetHeight; window.__pica_load_time = performance.now(); setTimeout(function(){window.__web_components_ready=true}, 1000)})",
-      "wait_for_javascript_expression": "window.__web_components_ready",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "javascript": "window.__web_components_ready" }
+      ],
       "smoothness": {
         "action": "tap_element",
         "find_element_expression": "document.querySelector('pi-app').$.Topics.$.topics.$.container.querySelector('.item > .card')",
diff --git a/tools/perf/page_sets/top_10.json b/tools/perf/page_sets/top_10.json
index b14ae24..31f5db5 100644
--- a/tools/perf/page_sets/top_10.json
+++ b/tools/perf/page_sets/top_10.json
@@ -8,26 +8,38 @@
     {
       "url": "https://www.google.com/#hl=en&q=barack+obama",
       "why": "top google property; a google tab is often open",
-      "wait_for_element_with_text": "Next"
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Next" }
+      ]
     },
     {
       "url": "https://mail.google.com/mail/",
       "why": "productivity, top google properties",
       "credentials": "google",
-      "wait_for_javascript_expression": "window.gmonkey !== undefined && document.getElementById('gb') !== null"
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "javascript": "window.gmonkey !== undefined && document.getElementById('gb') !== null" }
+      ]
     },
     {
       "url": "https://www.google.com/calendar/",
       "why": "productivity, top google properties",
       "credentials": "google",
-      "wait_for_element_with_selector": "div[class~=\"navForward\"]",
-      "post_navigate_javascript_to_execute": "(function() { var elem = document.createElement('meta');elem.name='viewport';elem.content='initial-scale=1';document.body.appendChild(elem); })();",
-      "wait_seconds": 2
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "javascript", "expression": "(function() { var elem = document.createElement('meta');elem.name='viewport';elem.content='initial-scale=1';document.body.appendChild(elem); })();" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" }
+      ]
     },
     {
       "url": "http://www.youtube.com",
       "why": "#3 (Alexa global)",
-      "wait_seconds": 2,
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 2 }
+      ],
       "credentials": "google"
     },
     {
@@ -35,7 +47,10 @@
       "url": "http://www.facebook.com/barackobama",
       "why": "top social,Public profile",
       "credentials": "facebook",
-      "wait_for_element_with_text": "About"
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "About" }
+      ]
     },
     {
       "name": "Wikipedia (1 tab)",
diff --git a/tools/perf/page_sets/top_25.json b/tools/perf/page_sets/top_25.json
index 3f47fa6..619ff77 100644
--- a/tools/perf/page_sets/top_25.json
+++ b/tools/perf/page_sets/top_25.json
@@ -8,148 +8,109 @@
     {
       "url": "https://www.google.com/#hl=en&q=barack+obama",
       "why": "top google property; a google tab is often open",
-      "wait_for_element_with_text": "Next",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Next" }
+      ],
       "stress_memory": [
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Next",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Next"
-        },
+        { "action": "click_element", "text": "Next" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Next" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Next",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Next"
-        },
+        { "action": "click_element", "text": "Next" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Next" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Next",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Previous"
-        },
+        { "action": "click_element", "text": "Next" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Previous" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Previous",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Previous"
-        },
+        { "action": "click_element", "text": "Previous" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Previous" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Previous",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Previous"
-        },
+        { "action": "click_element", "text": "Previous" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Previous" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Previous",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Images"
-        },
+        { "action": "click_element", "text": "Previous" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Images" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Images",
-          "wait_for_href_change": true,
-          "wait_for_element_with_text": "Images"
-        }
+        { "action": "click_element", "text": "Images" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "wait", "condition": "element", "text": "Images" }
       ]
     },
     {
       "url": "https://mail.google.com/mail/",
       "why": "productivity, top google properties",
       "credentials": "google",
-      "wait_for_javascript_expression": "window.gmonkey !== undefined && document.getElementById('gb') !== null",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "javascript": "window.gmonkey !== undefined && document.getElementById('gb') !== null" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scrollable_element_function": "function(callback) { gmonkey.load('2.0', function(api) { callback(api.getScrollableElement()); }); }"
       },
       "stress_memory": [
-        {
-          "action": "click_element",
-          "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#starred\"]",
-          "wait_for_href_change": true
-        },
-        {
-          "action": "click_element",
-          "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#inbox\"]",
-          "wait_for_href_change": true
-        }
+        { "action": "click_element", "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#starred\"]" },
+        { "action": "wait", "condition": "href_change" },
+        { "action": "click_element", "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#inbox\"]" },
+        { "action": "wait", "condition": "href_change" }
       ]
     },
     {
       "url": "https://www.google.com/calendar/",
       "why": "productivity, top google properties",
       "credentials": "google",
-      "wait_for_element_with_selector": "div[class~=\"navForward\"]",
-      "post_navigate_javascript_to_execute": "(function() { var elem = document.createElement('meta');elem.name='viewport';elem.content='initial-scale=1';document.body.appendChild(elem); })();",
-      "wait_seconds": 2,
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds":  2 },
+        { "action": "wait", "condition": "element", "selector":  "div[class~=\"navForward\"]" },
+        { "action": "javascript", "expression": "(function() { var elem = document.createElement('meta');elem.name='viewport';elem.content='initial-scale=1';document.body.appendChild(elem); })();" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scrollable_element_function": "function(callback) { callback(document.getElementById('scrolltimedeventswk')); }"
       },
       "stress_memory": [
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navForward\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navForward\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        },
-        {
-          "action": "click_element",
-          "selector": "div[class~=\"navBack\"]",
-          "wait_for_seconds": 2,
-          "wait_for_element_with_selector": "div[class~=\"navBack\"]"
-        }
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navForward\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "click_element", "selector": "div[class~=\"navBack\"]" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "selector": "div[class~=\"navBack\"]" }
       ]
     },
     {
       "url": "https://drive.google.com",
       "why": "productivity, top google properties",
       "credentials": "google",
-      "wait_for_javascript_expression": "document.getElementsByClassName('doclistview-list').length",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "javascript": "document.getElementsByClassName('doclistview-list').length" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scrollable_element_function": "function(callback) { callback(document.getElementsByClassName('doclistview-list')[0]); }"
@@ -160,8 +121,11 @@
       "url": "https://docs.google.com/document/d/1X-IKNjtEnx-WW5JIKRLsyhz5sbsat3mfTpAPUSX3_s4/view",
       "why": "productivity, top google properties; Sample doc in the link",
       "credentials": "google",
-      "wait_for_javascript_expression": "document.getElementsByClassName('kix-appview-editor').length",
-      "wait_seconds": 2,
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "javascript": "document.getElementsByClassName('kix-appview-editor').length" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scrollable_element_function": "function(callback) { callback(document.getElementsByClassName('kix-appview-editor')[0]); }"
@@ -171,112 +135,88 @@
       "url": "https://plus.google.com/110031535020051778989/posts",
       "why": "social; top google property; Public profile; infinite scrolls",
       "credentials": "google",
-      "wait_for_element_with_text": "Home",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Home" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scroll_is_infinite": true
       },
       "stress_memory": [
-        {
-          "action": "click_element",
-          "text": "Home",
-          "wait_seconds": 2,
-          "wait_for_element_with_text": "Profile"
-        },
-        {
-          "action": "click_element",
-          "text": "Profile",
-          "wait_seconds": 2,
-          "wait_for_element_with_text": "Explore"
-        },
-        {
-          "action": "click_element",
-          "text": "Explore",
-          "wait_seconds": 2,
-          "wait_for_element_with_text": "Events"
-        },
-        {
-          "action": "click_element",
-          "text": "Events",
-          "wait_seconds": 2,
-          "wait_for_element_with_text": "Communities"
-        },
-        {
-          "action": "click_element",
-          "text": "Communities",
-          "wait_seconds": 2,
-          "wait_for_element_with_text": "Home"
-        }
+        { "action": "click_element", "text": "Home" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "text": "Profile" },
+        { "action": "click_element", "text": "Profile" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "text": "Explore" },
+        { "action": "click_element", "text": "Explore" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "text": "Events" },
+        { "action": "click_element", "text": "Events" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "text": "Communities" },
+        { "action": "click_element", "text": "Communities" },
+        { "action": "wait", "seconds": 2 },
+        { "action": "wait", "condition": "element", "text": "Home" }
       ]
     },
     {
       "url": "http://www.youtube.com",
       "why": "#3 (Alexa global)",
-      "wait_seconds": 2,
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 2 }
+      ],
       "credentials": "google"
     },
     {
       "name": "Blogger",
       "url": "http://googlewebmastercentral.blogspot.com/",
       "why": "#11 (Alexa global), google property; some blogger layouts have infinite scroll but more interesting",
-      "wait_for_element_with_text": "accessibility",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "accessibility" }
+      ],
       "stress_memory": [
-        {
-          "action": "click_element",
-          "text": "accessibility",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "advanced"
-        },
+        { "action": "click_element", "text": "accessibility" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "advanced" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "advanced",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "beginner"
-        },
+        { "action": "click_element", "text": "advanced" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "beginner" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "beginner",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Home"
-        },
+        { "action": "click_element", "text": "beginner" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Home" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Home",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Home"
-        }
+        { "action": "click_element", "text": "Home" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Home" }
       ]
     },
     {
       "name": "Wordpress",
       "url": "http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/",
       "why": "#18 (Alexa global), Picked an interesting post",
-      "wait_for_element_with_selector": "a[href=\"http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/\"]",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "selector": "a[href=\"http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/\"]" }
+      ],
       "stress_memory": [
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "selector": "a[href=\"http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/\"]",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Features"
-        },
+        { "action": "click_element", "selector": "a[href=\"http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/\"]" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text":  "Features" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "Features",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "News"
-        },
+        { "action": "click_element", "text": "Features" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text":  "News" },
         { "action": "scroll" },
-        {
-          "action": "click_element",
-          "text": "News",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "News"
-        },
+        { "action": "click_element", "text": "News" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "News" },
         { "action": "scroll" }
       ]
     },
@@ -285,48 +225,33 @@
       "url": "http://www.facebook.com/barackobama",
       "why": "top social,Public profile",
       "credentials": "facebook",
-      "wait_for_element_with_text": "About",
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "condition": "element", "text": "About" }
+      ],
       "smoothness": {
         "action": "scroll",
         "scroll_is_infinite": true
       },
       "stress_memory": [
-        {
-          "action": "click_element",
-          "text": "About",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "The Audacity of Hope"
-        },
-        {
-          "action": "click_element",
-          "text": "The Audacity of Hope",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Back to Barack Obama's Timeline"
-        },
-        {
-          "action": "click_element",
-          "text": "Back to Barack Obama's Timeline",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "About"
-        },
-        {
-          "action": "click_element",
-          "text": "About",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Elected to U.S. Senate"
-        },
-        {
-          "action": "click_element",
-          "text": "Elected to U.S. Senate",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Home"
-        },
-        {
-          "action": "click_element",
-          "text": "Home",
-          "wait_for_navigate": true,
-          "wait_for_element_with_text": "Home"
-        }
+        { "action": "click_element", "text": "About" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "The Audacity of Hope" },
+        { "action": "click_element", "text": "The Audacity of Hope" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Back to Barack Obama's Timeline" },
+        { "action": "click_element", "text": "Back to Barack Obama's Timeline" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "About" },
+        { "action": "click_element", "text": "About" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Elected to U.S. Senate" },
+        { "action": "click_element", "text": "Elected to U.S. Senate" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Home" },
+        { "action": "click_element", "text": "Home" },
+        { "action": "wait", "condition": "navigate" },
+        { "action": "wait", "condition": "element", "text": "Home" }
       ]
     },
     {
@@ -343,7 +268,10 @@
       "name": "Twitter",
       "url": "https://twitter.com/katyperry",
       "why": "#8 (Alexa global),Picked an interesting page",
-      "wait_seconds": 2,
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 2 }
+      ],
       "smoothness": {
         "action": "scroll",
         "scroll_is_infinite": true
@@ -391,7 +319,10 @@
     {
       "url": "http://games.yahoo.com",
       "why": "#1 games according to Alexa (with actual games in it)",
-      "wait_seconds": 2
+      "navigate_steps" : [
+        { "action": "navigate" },
+        { "action": "wait", "seconds": 2 }
+      ]
     },
     {
       "url": "http://booking.com",
diff --git a/tools/perf/page_sets/tough_animation_cases.json b/tools/perf/page_sets/tough_animation_cases.json
index 1e26bcf..cba0f31 100644
--- a/tools/perf/page_sets/tough_animation_cases.json
+++ b/tools/perf/page_sets/tough_animation_cases.json
@@ -1,6 +1,6 @@
 {
   "description": "A collection of animation performance tests",
-  "smoothness": { "action": "wait", "condition": "duration", "seconds": 5 },
+  "smoothness": { "action": "wait", "seconds": 5 },
   "pages": [
     {
       "url": "file:///tough_animation_cases/keyframed_animations.html",
diff --git a/tools/perf/page_sets/tough_canvas_cases.json b/tools/perf/page_sets/tough_canvas_cases.json
index dde8ef8..a2ca25bd 100644
--- a/tools/perf/page_sets/tough_canvas_cases.json
+++ b/tools/perf/page_sets/tough_canvas_cases.json
@@ -2,7 +2,7 @@
   "description": "Self-driven Canvas2D animation examples",
   "archive_data_file": "../data/tough_canvas_cases.json",
   "make_javascript_deterministic": false,
-  "smoothness": { "action": "wait", "condition": "duration", "seconds": 5 },
+  "smoothness": { "action": "wait", "seconds": 5 },
   "pages": [
     { "url":"http://mudcu.be/labs/JS1k/BreathingGalaxies.html" },
     { "url":"http://runway.countlessprojects.com/prototype/performance_test.html" },