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/browser/ui/browser_close_browsertest.cc | |
| 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/browser/ui/browser_close_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_close_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc index c8baf02..2c32118 100644 --- a/chrome/browser/ui/browser_close_browsertest.cc +++ b/chrome/browser/ui/browser_close_browsertest.cc @@ -25,6 +25,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/download_item.h" #include "content/public/common/page_transition_types.h" +#include "content/public/test/browser_test_utils.h" #include "content/test/net/url_request_slow_download_job.h" using content::BrowserContext; @@ -174,8 +175,7 @@ class BrowserCloseTest : public InProcessBrowserTest { Browser* new_browser = new Browser(Browser::CreateParams(profile)); chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_START_PAGE); - ui_test_utils::WaitForLoadStop( - chrome::GetActiveWebContents(new_browser)); + content::WaitForLoadStop(chrome::GetActiveWebContents(new_browser)); new_browser->window()->Show(); return new_browser; } |