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

Unified Diff: chrome/browser/apps/guest_view/web_view_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/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 0ebf5eec51dfc0b03f3c8931b606a6e01d231435..337b21f86c402e06e6034424ff1bdcbe7008057b 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -571,12 +571,9 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
// Helper to load interstitial page in a <webview>.
void InterstitialTeardownTestHelper() {
// Start a HTTPS server so we can load an interstitial page inside guest.
- net::SpawnedTestServer::SSLOptions ssl_options;
- ssl_options.server_certificate =
- net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME;
- net::SpawnedTestServer https_server(
- net::SpawnedTestServer::TYPE_HTTPS, ssl_options,
- base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
+ https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME);
+ https_server.ServeFilesFromSourceDirectory("chrome/test/data");
ASSERT_TRUE(https_server.Start());
net::HostPortPair host_and_port = https_server.host_port_pair();
« no previous file with comments | « chrome/browser/apps/drive/drive_app_converter_browsertest.cc ('k') | chrome/browser/autofill/autofill_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698