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

Unified Diff: chrome/browser/unload_browsertest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase bug. 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: chrome/browser/unload_browsertest.cc
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index 3a368cd00bcddc9bf323bf262e7744c355e5ad44..ec7d76ddc67accfbbaa70e1213e716c90d04d263 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -25,6 +25,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/url_request/url_request_mock_http_job.h"
#include "net/url_request/url_request_test_util.h"
@@ -429,14 +430,12 @@ class FastUnloadTest : public UnloadTest {
}
void SetUpInProcessBrowserTestFixture() override {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
}
- void TearDownInProcessBrowserTestFixture() override { test_server()->Stop(); }
-
GURL GetUrl(const std::string& name) {
- return GURL(test_server()->GetURL(
- "files/fast_tab_close/" + name + ".html"));
+ return GURL(
+ embedded_test_server()->GetURL("/fast_tab_close/" + name + ".html"));
}
void NavigateToPage(const char* name) {

Powered by Google App Engine
This is Rietveld 408576698