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

Unified Diff: chrome/browser/fast_shutdown_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: 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: chrome/browser/fast_shutdown_browsertest.cc
diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc
index 33481c37a53ecd90f879f3c70806c55e0746f8d6..3a73d30a0a3748045d666af1a4842833a73598c5 100644
--- a/chrome/browser/fast_shutdown_browsertest.cc
+++ b/chrome/browser/fast_shutdown_browsertest.cc
@@ -18,6 +18,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/browser_test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
using content::BrowserThread;
@@ -41,9 +42,9 @@ class FastShutdown : public InProcessBrowserTest {
IN_PROC_BROWSER_TEST_F(FastShutdown, DISABLED_SlowTermination) {
// Need to run these tests on http:// since we only allow cookies on that (and
// https obviously).
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
// This page has an unload handler.
- GURL url = test_server()->GetURL("files/fast_shutdown/on_unloader.html");
+ GURL url = embedded_test_server()->GetURL("/fast_shutdown/on_unloader.html");
EXPECT_EQ("", content::GetCookies(browser()->profile(), url));
content::WindowedNotificationObserver window_observer(
« no previous file with comments | « chrome/browser/external_extension_browsertest.cc ('k') | chrome/browser/favicon/content_favicon_driver_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698