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

Unified Diff: chrome/browser/extensions/web_view_interactive_browsertest.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ready? Created 7 years, 6 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
Index: chrome/browser/extensions/web_view_interactive_browsertest.cc
diff --git a/chrome/browser/extensions/web_view_interactive_browsertest.cc b/chrome/browser/extensions/web_view_interactive_browsertest.cc
index bcece75dbe43132aec5ab21b48ba95e92604cf7b..cce2b993b9d2717c6ae3a1c36dbfd0aefb8dbbb5 100644
--- a/chrome/browser/extensions/web_view_interactive_browsertest.cc
+++ b/chrome/browser/extensions/web_view_interactive_browsertest.cc
@@ -18,6 +18,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/test/browser_test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/test/ui_controls.h"
@@ -127,7 +128,7 @@ class WebViewInteractiveTest
std::string host_str("localhost"); // Must stay in scope with replace_host.
replace_host.SetHostStr(host_str);
- GURL guest_url = test_server()->GetURL(guest_url_spec);
+ GURL guest_url = embedded_test_server()->GetURL(guest_url_spec);
guest_url = guest_url.ReplaceComponents(replace_host);
ui_test_utils::UrlLoadObserver guest_observer(
@@ -290,7 +291,7 @@ class WebViewInteractiveTest
IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PointerLock) {
SetupTest("web_view/pointer_lock",
- "files/extensions/platform_apps/web_view/pointer_lock/guest.html");
+ "/extensions/platform_apps/web_view/pointer_lock/guest.html");
// Move the mouse over the Lock Pointer button.
ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
@@ -372,7 +373,7 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_Focus) {
// Tests that guests receive edit commands and respond appropriately.
IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommands) {
SetupTest("web_view/edit_commands",
- "files/extensions/platform_apps/web_view/edit_commands/guest.html");
+ "/extensions/platform_apps/web_view/edit_commands/guest.html");
ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
GetPlatformAppWindow()));
@@ -390,7 +391,7 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommands) {
// Tests that guests receive edit commands and respond appropriately.
IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommandsNoMenu) {
SetupTest("web_view/edit_commands_no_menu",
- "files/extensions/platform_apps/web_view/edit_commands_no_menu/"
+ "/extensions/platform_apps/web_view/edit_commands_no_menu/"
"guest.html");
ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
@@ -444,7 +445,7 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, ExecuteCode) {
IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PopupPositioning) {
SetupTest(
"web_view/popup_positioning",
- "files/extensions/platform_apps/web_view/popup_positioning/guest.html");
+ "/extensions/platform_apps/web_view/popup_positioning/guest.html");
ASSERT_TRUE(guest_web_contents());
PopupTestHelper(gfx::Point());
@@ -461,7 +462,7 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PopupPositioning) {
IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_PopupPositioningMoved) {
SetupTest(
"web_view/popup_positioning_moved",
- "files/extensions/platform_apps/web_view/popup_positioning_moved"
+ "/extensions/platform_apps/web_view/popup_positioning_moved"
"/guest.html");
ASSERT_TRUE(guest_web_contents());

Powered by Google App Engine
This is Rietveld 408576698