Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: content/browser/mouseleave_browsertest.cc

Issue 10815025: Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_brows… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/media_browsertest.cc ('k') | content/browser/plugin_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mouseleave_browsertest.cc
===================================================================
--- content/browser/mouseleave_browsertest.cc (revision 147602)
+++ content/browser/mouseleave_browsertest.cc (working copy)
@@ -10,6 +10,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
+#include "content/public/test/browser_test_utils.h"
#include "ui/ui_controls/ui_controls.h"
namespace {
@@ -51,7 +52,7 @@
// Navigate to the test html page.
string16 load_expected_title(ASCIIToUTF16("onload"));
- ui_test_utils::TitleWatcher load_title_watcher(tab, load_expected_title);
+ content::TitleWatcher load_title_watcher(tab, load_expected_title);
ui_test_utils::NavigateToURL(browser(), test_url);
// Wait for the onload() handler to complete so we can do the
// next part of the test.
@@ -63,8 +64,7 @@
// Wait on the correct intermediate title.
string16 entered_expected_title(ASCIIToUTF16("entered"));
- ui_test_utils::TitleWatcher entered_title_watcher(
- tab, entered_expected_title);
+ content::TitleWatcher entered_title_watcher(tab, entered_expected_title);
EXPECT_EQ(entered_expected_title, entered_title_watcher.WaitAndGetTitle());
// Move the cursor above the content again, which should trigger
@@ -73,7 +73,7 @@
// Wait on the correct final value of the cookie.
string16 left_expected_title(ASCIIToUTF16("left"));
- ui_test_utils::TitleWatcher left_title_watcher(tab, left_expected_title);
+ content::TitleWatcher left_title_watcher(tab, left_expected_title);
EXPECT_EQ(left_expected_title, left_title_watcher.WaitAndGetTitle());
}
« no previous file with comments | « content/browser/media_browsertest.cc ('k') | content/browser/plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698