Remove href_change and navigate from wait action

tools/perf/page_sets/top_25.json

 {
   "description": "Pages hand-picked for 2012 CrOS scrolling tuning efforts.",
   "archive_data_file": "data/top_25.json",
   "credentials_path": "data/credentials.json",
   "user_agent_type": "desktop",
   "smoothness": { "action": "scroll" },
   "pages": [
     {
       "url": "https://www.google.com/#hl=en&q=barack+obama",
       "why": "top google property; a google tab is often open",
       "navigate_steps" : [
         { "action": "navigate" },
         { "action": "wait", "condition": "element", "text": "Next" }
       ],
       "stress_memory": [
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Next" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Next",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Next" },
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Next" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Next",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Next" },
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Next" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Next",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Previous" },
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Previous" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Previous",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Previous" },
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Previous" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Previous",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Previous" },
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Previous" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Previous",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Images" },
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Images" },
-        { "action": "wait", "condition": "href_change" },
+        { "action": "javascript_click", "text": "Images",
+          "wait_until" : {"condition": "href_change" }},
         { "action": "wait", "condition": "element", "text": "Images" }
       ]
     },
     {
       "url": "https://mail.google.com/mail/",
       "why": "productivity, top google properties",
       "credentials": "google",
       "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": "javascript_click", "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#starred\"]" },
-        { "action": "wait", "condition": "href_change" },
-        { "action": "javascript_click", "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#inbox\"]" },
-        { "action": "wait", "condition": "href_change" }
+        { "action": "javascript_click", "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#starred\"]",
+            "wait_until" : {"condition": "href_change" }},
+        { "action": "javascript_click", "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#inbox\"]",
+            "wait_until" : {"condition": "href_change" }}
       ]
     },
     {
       "url": "https://www.google.com/calendar/",
       "why": "productivity, top google properties",
       "credentials": "google",
       "navigate_steps" : [
         { "action": "navigate" },
         { "action": "wait", "seconds":  2 },
         { "action": "wait", "condition": "element", "selector":  "div[class~=\"navForward\"]" },
@@ skipping 92 matching lines @@
     },
     {
       "name": "Blogger",
       "url": "http://googlewebmastercentral.blogspot.com/",
       "why": "#11 (Alexa global), google property; some blogger layouts have infinite scroll but more interesting",
       "navigate_steps" : [
         { "action": "navigate" },
         { "action": "wait", "condition": "element", "text": "accessibility" }
       ],
       "stress_memory": [
-        { "action": "javascript_click", "text": "accessibility" },
-        { "action": "wait", "condition": "navigate" },
+        { "action": "javascript_click", "text": "accessibility",
+          "wait_until" : {"condition": "navigate" }},
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "advanced" },
-        { "action": "wait", "condition": "navigate" },
+        { "action": "javascript_click", "text": "advanced",
+          "wait_until" : {"condition": "navigate" }},
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "beginner" },
-        { "action": "wait", "condition": "navigate" },
+        { "action": "javascript_click", "text": "beginner",
+          "wait_until" : {"condition": "navigate" }},
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Home" },
-        { "action": "wait", "condition": "navigate" }
+        { "action": "javascript_click", "text": "Home",
+          "wait_until" : {"condition": "navigate" }}
       ]
     },
     {
       "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",
       "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": "javascript_click", "selector": "a[href=\"http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/\"]" },
-        { "action": "wait", "condition": "navigate" },
+        { "action": "javascript_click", "selector": "a[href=\"http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/\"]",
+          "wait_until" : { "condition": "navigate" }},
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "Features" },
-        { "action": "wait", "condition": "navigate" },
+        { "action": "javascript_click", "text": "Features",
+          "wait_until" : { "condition": "navigate" }},
         { "action": "scroll" },
-        { "action": "javascript_click", "text": "News" },
-        { "action": "wait", "condition": "navigate" },
+        { "action": "javascript_click", "text": "News",
+          "wait_until" : { "condition": "navigate" }},
         { "action": "scroll" }
       ]
     },
     {
       "name": "Facebook",
       "url": "http://www.facebook.com/barackobama",
       "why": "top social,Public profile",
       "credentials": "facebook",
       "navigate_steps" : [
         { "action": "navigate" },
         { "action": "wait", "condition": "element", "text": "About" }
       ],
       "smoothness": {
         "action": "scroll",
         "scroll_is_infinite": true
       },
       "stress_memory": [
-        { "action": "javascript_click", "text": "About" },
-        { "action": "wait", "condition": "navigate" },
-        { "action": "javascript_click", "text": "The Audacity of Hope" },
-        { "action": "wait", "condition": "navigate" },
-        { "action": "javascript_click", "text": "Back to Barack Obama's Timeline" },
-        { "action": "wait", "condition": "navigate" },
-        { "action": "javascript_click", "text": "About" },
-        { "action": "wait", "condition": "navigate" },
-        { "action": "javascript_click", "text": "Elected to U.S. Senate" },
-        { "action": "wait", "condition": "navigate" },
-        { "action": "javascript_click", "text": "Home" },
-        { "action": "wait", "condition": "navigate" }
+        { "action": "javascript_click", "text": "About",
+          "wait_until" : { "condition": "navigate" }},
+        { "action": "javascript_click", "text": "The Audacity of Hope",
+          "wait_until" : { "condition": "navigate" }},
+        { "action": "javascript_click", "text": "Back to Barack Obama's Timeline",
+          "wait_until" : { "condition": "navigate" }},
+        { "action": "javascript_click", "text": "About",
+          "wait_until" : { "condition": "navigate" }},
+        { "action": "javascript_click", "text": "Elected to U.S. Senate",
+          "wait_until" : { "condition": "navigate" }},
+        { "action": "javascript_click", "text": "Home",
+          "wait_until" : { "condition": "navigate" }}
       ]
     },
     {
       "name": "LinkedIn",
       "url": "http://www.linkedin.com/in/linustorvalds",
       "why": "#12 (Alexa global),Public profile"
     },
     {
       "name": "Wikipedia (1 tab)",
       "url": "http://en.wikipedia.org/wiki/Wikipedia",
@@ skipping 70 matching lines @@
     {
       "url": "http://sports.yahoo.com/",
       "why": "#1 Alexa sports"
     },
     {
       "url": "http://techcrunch.com",
       "why": "top tech blog"
     }
   ]
 }