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

Unified Diff: content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc

Issue 1411073005: Migrating tests to use EmbeddedTestServer (/content) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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
Index: content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc
diff --git a/content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc b/content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc
index 437c5e52468180e78f7b1eead1332cdec8f76681..102a560437dc6c8cbbf647385266c1a2670ea14f 100644
--- a/content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc
+++ b/content/browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc
@@ -117,8 +117,8 @@ class TouchSelectionControllerClientAuraTest : public ContentBrowserTest {
// size to the root window. Returns after the navigation to the url is
// complete.
void StartTestWithPage(const std::string& url) {
- ASSERT_TRUE(test_server()->Start());
- GURL test_url(test_server()->GetURL(url));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ GURL test_url(embedded_test_server()->GetURL(url));
NavigateToURL(shell(), test_url);
aura::Window* content = shell()->web_contents()->GetContentNativeView();
content->GetHost()->SetBounds(gfx::Rect(800, 600));
@@ -163,7 +163,7 @@ class TouchSelectionControllerClientAuraTest : public ContentBrowserTest {
// menu properly.
IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest, BasicSelection) {
// Set the test page up.
- ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
+ ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/touch_selection.html"));
WebContents* web_contents =
static_cast<WebContentsImpl*>(shell()->web_contents());
RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
@@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest, BasicSelection) {
IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest,
BasicInsertionFollowedByTapsOnHandle) {
// Set the test page up.
- ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
+ ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/touch_selection.html"));
WebContents* web_contents =
static_cast<WebContentsImpl*>(shell()->web_contents());
RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
@@ -256,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest,
IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest,
QuickMenuHiddenOnTouch) {
// Set the test page up.
- ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
+ ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/touch_selection.html"));
WebContents* web_contents =
static_cast<WebContentsImpl*>(shell()->web_contents());
RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
@@ -319,7 +319,7 @@ IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest,
// Tests that the quick menu and touch handles are hidden during an scroll.
IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest, HiddenOnScroll) {
// Set the test page up.
- ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
+ ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/touch_selection.html"));
WebContents* web_contents =
static_cast<WebContentsImpl*>(shell()->web_contents());
RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
@@ -398,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest, HiddenOnScroll) {
IN_PROC_BROWSER_TEST_F(TouchSelectionControllerClientAuraTest,
HiddenAfterOverscroll) {
// Set the page up.
- ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
+ ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/touch_selection.html"));
WebContents* web_contents =
static_cast<WebContentsImpl*>(shell()->web_contents());
RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
« no previous file with comments | « content/browser/media/webrtc_webcam_browsertest.cc ('k') | content/browser/renderer_host/render_message_filter_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698