summaryrefslogtreecommitdiffstats
path: root/content/browser/session_history_browsertest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 05:40:59 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 05:40:59 +0000
commit35daebe09bf03548ca99e58bc6ebb57d5b7a520d (patch)
tree0f50f5e4bbb1579d98154d50800543d9ea05301b /content/browser/session_history_browsertest.cc
parent86fcebea2f4f126302400b13a8176a7e43d0a7ab (diff)
downloadchromium_src-35daebe09bf03548ca99e58bc6ebb57d5b7a520d.zip
chromium_src-35daebe09bf03548ca99e58bc6ebb57d5b7a520d.tar.gz
chromium_src-35daebe09bf03548ca99e58bc6ebb57d5b7a520d.tar.bz2
Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_browsertests.
BUG=90448 TBR=scottmg Review URL: https://chromiumcodereview.appspot.com/10815025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/session_history_browsertest.cc')
-rw-r--r--content/browser/session_history_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index fe28fe4..e918988 100644
--- a/content/browser/session_history_browsertest.cc
+++ b/content/browser/session_history_browsertest.cc
@@ -13,6 +13,7 @@
#include "content/public/browser/notification_types.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
#include "net/test/test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -68,7 +69,7 @@ class SessionHistoryTest : public InProcessBrowserTest {
void NavigateAndCheckTitle(const char* filename,
const std::string& expected_title) {
string16 expected_title16(ASCIIToUTF16(expected_title));
- ui_test_utils::TitleWatcher title_watcher(
+ content::TitleWatcher title_watcher(
chrome::GetActiveWebContents(browser()), expected_title16);
ui_test_utils::NavigateToURL(browser(), GetURL(filename));
ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle());