diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 01:15:35 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 01:15:35 +0000 |
| commit | 6ddc6e3f2a1a23c888b13f97c0a9ada270158549 (patch) | |
| tree | 31b6370c21a5752b384f2b2f4d83e480619f8195 /chrome/test/perf | |
| parent | def55e02c79cd340a6a8a778e422da16bf94ae28 (diff) | |
| download | chromium_src-6ddc6e3f2a1a23c888b13f97c0a9ada270158549.zip chromium_src-6ddc6e3f2a1a23c888b13f97c0a9ada270158549.tar.gz chromium_src-6ddc6e3f2a1a23c888b13f97c0a9ada270158549.tar.bz2 | |
Move WaitForLoadStop from ui_test_utils to browser_test_utils so that it can be reused in content_browsertests.
BUG=90448
TBR=viettrungluu
Review URL: https://chromiumcodereview.appspot.com/10823029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
| -rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 2f27898..10fa750 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -28,6 +28,7 @@ #include "chrome/test/perf/perf_test.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" +#include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/test/gpu/gpu_test_config.h" #include "googleurl/src/gurl.h" @@ -326,7 +327,7 @@ class ThroughputTest : public BrowserPerfTest { LOG(INFO) << gurl_.possibly_invalid_spec(); ui_test_utils::NavigateToURLWithDisposition( browser(), gurl_, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE); - ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); + content::WaitForLoadStop(chrome::GetActiveWebContents(browser())); // Let the test spin up. LOG(INFO) << "Spinning up test..."; |