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

Unified Diff: chrome/browser/loadtimes_extension_bindings_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: rebase 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
« no previous file with comments | « chrome/browser/infobars/infobars_browsertest.cc ('k') | chrome/browser/media/chrome_webrtc_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/loadtimes_extension_bindings_browsertest.cc
diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
index efca60a4dd032b04752c84db5642f7139fd3421b..24ab84633d5d8209215781b3dff1688db92f0b90 100644
--- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc
+++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
@@ -8,7 +8,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
public:
@@ -45,8 +45,8 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
LoadTimesSameAfterClientInDocNavigation) {
- ASSERT_TRUE(test_server()->Start());
- GURL plain_url = test_server()->GetURL("blank");
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ GURL plain_url = embedded_test_server()->GetURL("/simple.html");
ui_test_utils::NavigateToURL(browser(), plain_url);
content::WebContents* contents =
browser()->tab_strip_model()->GetActiveWebContents();
@@ -61,8 +61,8 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
LoadTimesSameAfterUserInDocNavigation) {
- ASSERT_TRUE(test_server()->Start());
- GURL plain_url = test_server()->GetURL("blank");
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ GURL plain_url = embedded_test_server()->GetURL("/simple.html");
GURL hash_url(plain_url.spec() + "#");
ui_test_utils::NavigateToURL(browser(), plain_url);
content::WebContents* contents =
« no previous file with comments | « chrome/browser/infobars/infobars_browsertest.cc ('k') | chrome/browser/media/chrome_webrtc_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698