| Index: tools/perf/page_sets/top_10.py
|
| diff --git a/tools/perf/page_sets/top_10.py b/tools/perf/page_sets/top_10.py
|
| index ed5f9b92da8cd582e2230d3489ffacd82cde07c3..2ec8247651d9621294ed4e2d063f542ddc64cda7 100644
|
| --- a/tools/perf/page_sets/top_10.py
|
| +++ b/tools/perf/page_sets/top_10.py
|
| @@ -22,8 +22,7 @@ class Google(SimpleScrollPage):
|
|
|
| def RunNavigateSteps(self, action_runner):
|
| super(Google, self).RunNavigateSteps(action_runner)
|
| - action_runner.RunAction(WaitAction(
|
| - {'condition': 'element', 'text': 'Next'}))
|
| + action_runner.WaitForElement(text='Next')
|
|
|
|
|
| class Gmail(SimpleScrollPage):
|
| @@ -35,9 +34,9 @@ class Gmail(SimpleScrollPage):
|
|
|
| def RunNavigateSteps(self, action_runner):
|
| super(Gmail, self).RunNavigateSteps(action_runner)
|
| - action_runner.RunAction(WaitAction(
|
| - {'javascript' : 'window.gmonkey !== undefined &&'
|
| - 'document.getElementById("gb") !== null'}))
|
| + action_runner.WaitForJavaScriptCondition(
|
| + 'window.gmonkey !== undefined &&'
|
| + 'document.getElementById("gb") !== null')
|
|
|
|
|
| class GoogleCalendar(SimpleScrollPage):
|
| @@ -55,9 +54,8 @@ class GoogleCalendar(SimpleScrollPage):
|
| elem.content="initial-scale=1";
|
| document.body.appendChild(elem);
|
| })();''')
|
| - action_runner.RunAction(WaitAction({'seconds' : 2}))
|
| - action_runner.RunAction(WaitAction({
|
| - 'condition' : 'element', 'selector' : 'div[class~="navForward"]'}))
|
| + action_runner.Wait(2)
|
| + action_runner.WaitForElement('div[class~="navForward"]')
|
|
|
|
|
| class Youtube(SimpleScrollPage):
|
| @@ -69,7 +67,7 @@ class Youtube(SimpleScrollPage):
|
|
|
| def RunNavigateSteps(self, action_runner):
|
| super(Youtube, self).RunNavigateSteps(action_runner)
|
| - action_runner.RunAction(WaitAction({'seconds' : 2}))
|
| + action_runner.Wait(2)
|
|
|
|
|
| class Facebook(SimpleScrollPage):
|
| @@ -82,8 +80,7 @@ class Facebook(SimpleScrollPage):
|
|
|
| def RunNavigateSteps(self, action_runner):
|
| super(Facebook, self).RunNavigateSteps(action_runner)
|
| - action_runner.RunAction(WaitAction(
|
| - {'condition': 'element', 'text': 'About'}))
|
| + action_runner.WaitForElement(text='About')
|
|
|
|
|
| class Top10PageSet(page_set_module.PageSet):
|
|
|