Adding SSL ETS Tests

net/url_request/url_fetcher_impl_unittest.cc

Index: net/url_request/url_fetcher_impl_unittest.cc
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index 37e690244cf15dcb146117188421994b8caa5a45..2e86c5da1c933e3b791cead556f99413d4c65f69 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -33,7 +33,7 @@
 #include "net/base/upload_file_element_reader.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_response_headers.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
@@ -56,11 +56,11 @@ namespace {
 // TODO(akalin): Move all the test data to somewhere under net/.
 const base::FilePath::CharType kDocRoot[] =
     FILE_PATH_LITERAL("net/data/url_fetcher_impl_unittest");
-const char kTestServerFilePrefix[] = "files/";
+const char kTestServerFilePrefix[] = "/";
 
 // Test server path and response body for the default URL used by many of the
 // tests.
-const char kDefaultResponsePath[] = "defaultresponse";
+const char kDefaultResponsePath[] = "/defaultresponse";
 const char kDefaultResponseBody[] =
     "Default response given for path: /defaultresponse";
 
@@ -386,8 +386,12 @@ class URLFetcherTest : public testing::Test {
       EXPECT_EQ(requested_out_path, out_path);
     }
 
+    base::FilePath server_root;
+    PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
+
     EXPECT_TRUE(base::ContentsEqual(
-        test_server_->GetDocumentRoot().AppendASCII(file_to_fetch), out_path));
+        server_root.Append(base::FilePath(kDocRoot)).AppendASCII(file_to_fetch),
+        out_path));
 
     // Delete the delegate and run the message loop to give the fetcher's
     // destructor a chance to delete the file.
@@ -413,7 +417,7 @@ class URLFetcherTest : public testing::Test {
 
     // URL that will hang when lookups reach the host resolver.
     hanging_url_ = GURL(base::StringPrintf(
-        "http://example.com:%d/%s", test_server_->host_port_pair().port(),
+        "http://example.com:%d%s", test_server_->host_port_pair().port(),
         kDefaultResponsePath));
     ASSERT_TRUE(hanging_url_.is_valid());
 
@@ -432,16 +436,15 @@ class URLFetcherTest : public testing::Test {
   // Initializes |test_server_| without starting it.  Allows subclasses to use
   // their own server configuration.
   virtual void SetUpServer() {
-    test_server_.reset(new SpawnedTestServer(SpawnedTestServer::TYPE_HTTP,
-                                             SpawnedTestServer::kLocalhost,
-                                             base::FilePath(kDocRoot)));
+    test_server_.reset(new EmbeddedTestServer);
+    test_server_->AddDefaultHandlers(base::FilePath(kDocRoot));
   }
 
   // Network thread for cross-thread tests.  Most threads just use the main
   // thread for network activity.
   scoped_ptr<base::Thread> network_thread_;
 
-  scoped_ptr<SpawnedTestServer> test_server_;
+  scoped_ptr<EmbeddedTestServer> test_server_;
   GURL hanging_url_;
 
   size_t num_upload_streams_created_;
@@ -456,10 +459,10 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest {
 
   // URLFetcherTest:
   void SetUpServer() override {
-    SpawnedTestServer::SSLOptions ssl_options(
-        SpawnedTestServer::SSLOptions::CERT_EXPIRED);
-    test_server_.reset(new SpawnedTestServer(
-        SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(kDocRoot)));
+    test_server_.reset(
+        new EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS));
+    test_server_->SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED);
+    test_server_->ServeFilesFromSourceDirectory("net/data/ssl");
   }
 };
 
@@ -660,7 +663,7 @@ TEST_F(URLFetcherTest, PostString) {
   const char kUploadData[] = "bobsyeruncle";
 
   WaitingURLFetcherDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   delegate.fetcher()->SetUploadData("application/x-www-form-urlencoded",
                                     kUploadData);
@@ -677,7 +680,7 @@ TEST_F(URLFetcherTest, PostEmptyString) {
   const char kUploadData[] = "";
 
   WaitingURLFetcherDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   delegate.fetcher()->SetUploadData("application/x-www-form-urlencoded",
                                     kUploadData);
@@ -694,7 +697,7 @@ TEST_F(URLFetcherTest, PostEntireFile) {
   base::FilePath upload_path = GetUploadFileTestPath();
 
   WaitingURLFetcherDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   delegate.fetcher()->SetUploadFilePath("application/x-www-form-urlencoded",
                                         upload_path, 0, kuint64max,
@@ -717,7 +720,7 @@ TEST_F(URLFetcherTest, PostFileRange) {
   base::FilePath upload_path = GetUploadFileTestPath();
 
   WaitingURLFetcherDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   delegate.fetcher()->SetUploadFilePath("application/x-www-form-urlencoded",
                                         upload_path, kRangeStart, kRangeLength,
@@ -736,7 +739,7 @@ TEST_F(URLFetcherTest, PostFileRange) {
 
 TEST_F(URLFetcherTest, PostWithUploadStreamFactory) {
   WaitingURLFetcherDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   delegate.fetcher()->SetUploadStreamFactory(
       "text/plain",
@@ -753,7 +756,7 @@ TEST_F(URLFetcherTest, PostWithUploadStreamFactory) {
 
 TEST_F(URLFetcherTest, PostWithUploadStreamFactoryAndRetries) {
   WaitingURLFetcherDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo?status=500"),
+  delegate.CreateFetcher(test_server_->GetURL("/echo?status=500"),
                          URLFetcher::POST, CreateSameThreadContextGetter());
   delegate.fetcher()->SetAutomaticallyRetryOn5xx(true);
   delegate.fetcher()->SetMaxRetriesOn5xx(1);
@@ -815,7 +818,7 @@ class CheckUploadProgressDelegate : public WaitingURLFetcherDelegate {
 
 TEST_F(URLFetcherTest, UploadProgress) {
   CheckUploadProgressDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   // Use a chunked upload so that the upload can be paused after uploading data.
   // Since upload progress uses a timer, the delegate may not receive any
@@ -869,8 +872,12 @@ TEST_F(URLFetcherTest, DownloadProgress) {
   const char kFileToFetch[] = "animate1.gif";
 
   std::string file_contents;
+
+  base::FilePath server_root;
+  PathService::Get(base::DIR_SOURCE_ROOT, &server_root);
+
   ASSERT_TRUE(base::ReadFileToString(
-      test_server_->GetDocumentRoot().AppendASCII(kFileToFetch),
+      server_root.Append(base::FilePath(kDocRoot)).AppendASCII(kFileToFetch),
       &file_contents));
 
   CheckDownloadProgressDelegate delegate(file_contents.size());
@@ -905,7 +912,7 @@ class CancelOnUploadProgressDelegate : public WaitingURLFetcherDelegate {
 // callback.
 TEST_F(URLFetcherTest, CancelInUploadProgressCallback) {
   CancelOnUploadProgressDelegate delegate;
-  delegate.CreateFetcher(test_server_->GetURL("echo"), URLFetcher::POST,
+  delegate.CreateFetcher(test_server_->GetURL("/echo"), URLFetcher::POST,
                          CreateSameThreadContextGetter());
   delegate.fetcher()->SetChunkedUpload("application/x-www-form-urlencoded");
   delegate.fetcher()->Start();
@@ -960,7 +967,7 @@ TEST_F(URLFetcherTest, CancelInDownloadProgressCallback) {
 TEST_F(URLFetcherTest, Headers) {
   WaitingURLFetcherDelegate delegate;
   delegate.CreateFetcher(
-      test_server_->GetURL("set-header?cache-control: private"),
+      test_server_->GetURL("/set-header?cache-control: private"),
       URLFetcher::GET, CreateSameThreadContextGetter());
   delegate.StartFetcherAndWait();
 
@@ -991,7 +998,7 @@ TEST_F(URLFetcherTest, StopOnRedirect) {
 
   WaitingURLFetcherDelegate delegate;
   delegate.CreateFetcher(
-      test_server_->GetURL(std::string("server-redirect?") + kRedirectTarget),
+      test_server_->GetURL(std::string("/server-redirect?") + kRedirectTarget),
       URLFetcher::GET, CreateSameThreadContextGetter());
   delegate.fetcher()->SetStopOnRedirect(true);
   delegate.StartFetcherAndWait();
@@ -1035,7 +1042,7 @@ TEST_F(URLFetcherTest, ThrottleOnRepeatedFetches) {
 
 TEST_F(URLFetcherTest, ThrottleOn5xxRetries) {
   base::Time start_time = Time::Now();
-  GURL url(test_server_->GetURL("files/server-unavailable.html"));
+  GURL url(test_server_->GetURL("/server-unavailable.html"));
 
   scoped_refptr<FetcherTestURLRequestContextGetter> context_getter(
       CreateSameThreadContextGetter());
@@ -1072,7 +1079,7 @@ TEST_F(URLFetcherTest, ThrottleOn5xxRetries) {
 // Tests overload protection, when responses passed through.
 TEST_F(URLFetcherTest, ProtectTestPassedThrough) {
   base::Time start_time = Time::Now();
-  GURL url(test_server_->GetURL("files/server-unavailable.html"));
+  GURL url(test_server_->GetURL("/server-unavailable.html"));
 
   scoped_refptr<FetcherTestURLRequestContextGetter> context_getter(
       CreateSameThreadContextGetter());
@@ -1241,7 +1248,7 @@ TEST_F(URLFetcherTest, ReuseFetcherForSameURL) {
   scoped_refptr<URLRequestContextGetter> context_getter(
       CreateSameThreadContextGetter());
   ReuseFetcherDelegate delegate(context_getter);
-  delegate.CreateFetcher(test_server_->GetURL("echoheader?test"),
+  delegate.CreateFetcher(test_server_->GetURL("/echoheader?test"),
                          URLFetcher::GET, context_getter);
   delegate.fetcher()->SetExtraRequestHeaders("test: request1");
   delegate.StartFetcherAndWait();