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

Unified Diff: content/browser/webui/web_ui_mojo_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
« no previous file with comments | « content/browser/webkit_browsertest.cc ('k') | content/child/site_isolation_stats_gatherer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_mojo_browsertest.cc
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 5ceb632a5d63f5e4c8722a1854d42aeeabd56b8e..70b6c067ecb88e59485a3f1b957550e4fd4a70cf 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -27,6 +27,7 @@
#include "content/shell/browser/shell.h"
#include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
#include "mojo/test/test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
#include "third_party/mojo/src/mojo/public/js/constants.h"
@@ -201,10 +202,10 @@ IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndPing) {
return;
got_message = false;
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
base::RunLoop run_loop;
factory()->set_run_loop(&run_loop);
- GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?ping"));
+ GURL test_url(embedded_test_server()->GetURL("/web_ui_mojo.html?ping"));
NavigateToURL(shell(), test_url);
// RunLoop is quit when message received from page.
run_loop.Run();
@@ -231,9 +232,9 @@ IN_PROC_BROWSER_TEST_F(WebUIMojoTest, ConnectToApplication) {
"content/public/test/test_mojo_service.mojom"))
return;
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
NavigateToURL(shell(),
- test_server()->GetURL("files/web_ui_mojo_shell_test.html"));
+ embedded_test_server()->GetURL("/web_ui_mojo_shell_test.html"));
DOMMessageQueue message_queue;
std::string message;
« no previous file with comments | « content/browser/webkit_browsertest.cc ('k') | content/child/site_isolation_stats_gatherer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698