Migrating tests to use EmbeddedTestServer (/content)

content/child/site_isolation_stats_gatherer_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/resource_type.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace content {
 
 // These tests simulate exploited renderer processes, which can fetch arbitrary
 // resources from other websites, not constrained by the Same Origin Policy.  We
 // are trying to verify that the renderer cannot fetch any cross-site document
 // responses even when the Same Origin Policy is turned off inside the renderer.
 class SiteIsolationStatsGathererBrowserTest : public ContentBrowserTest {
  public:
   SiteIsolationStatsGathererBrowserTest() {}
   ~SiteIsolationStatsGathererBrowserTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    ASSERT_TRUE(test_server()->Start());
+    ASSERT_TRUE(embedded_test_server()->Start());
     // Add a host resolver rule to map all outgoing requests to the test server.
     // This allows us to use "real" hostnames in URLs, which we can use to
     // create arbitrary SiteInstances.
     command_line->AppendSwitchASCII(
         switches::kHostResolverRules,
-        "MAP * " + test_server()->host_port_pair().ToString() +
+        "MAP * " + embedded_test_server()->host_port_pair().ToString() +
             ",EXCLUDE localhost");
 
     // Since we assume exploited renderer process, it can bypass the same origin
     // policy at will. Simulate that by passing the disable-web-security flag.
     command_line->AppendSwitch(switches::kDisableWebSecurity);
   }
 
   void InspectHistograms(const base::HistogramTester& histograms,
                          bool should_be_blocked,
                          const std::string& resource_name) {
@@ skipping 57 matching lines @@
           histograms.GetAllSamples(base + ".Blocked.RenderableStatusCode"),
           testing::ElementsAre(base::Bucket(RESOURCE_TYPE_XHR, 1)))
           << "The wrong RenderableStatusCode bucket was incremented.";
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SiteIsolationStatsGathererBrowserTest);
 };
 
-// TODO(dsjang): we cannot run these tests on Android since SetUpCommandLine()
-// is executed before the I/O thread is created on Android. After this bug
-// (crbug.com/278425) is resolved, we can enable this test case on Android.
-#if defined(OS_ANDROID)
-#define MAYBE_CrossSiteDocumentBlockingForMimeType \
-  DISABLED_CrossSiteDocumentBlockingForMimeType
-#else
-#define MAYBE_CrossSiteDocumentBlockingForMimeType \
-  CrossSiteDocumentBlockingForMimeType
-#endif
-
 IN_PROC_BROWSER_TEST_F(SiteIsolationStatsGathererBrowserTest,
-                       MAYBE_CrossSiteDocumentBlockingForMimeType) {
+                       CrossSiteDocumentBlockingForMimeType) {
   // Load a page that issues illegal cross-site document requests to bar.com.
   // The page uses XHR to request HTML/XML/JSON documents from bar.com, and
   // inspects if any of them were successfully received. Currently, on illegal
   // access, the XHR requests should succeed, but the UMA histograms should
   // record that they would have been blocked. This test is only possible since
   // we run the browser without the same origin policy.
-  GURL foo("http://foo.com/files/cross_site_document_request.html");
+  GURL foo("http://foo.com/cross_site_document_request.html");
 
   NavigateToURL(shell(), foo);
 
   // Flush out existing histogram activity.
   FetchHistogramsFromChildProcesses();
 
   // The following are files under content/test/data/site_isolation. All
   // should be disallowed for cross site XHR under the document blocking policy.
   const char* blocked_resources[] = {
       "comment_valid.html",
@@ skipping 40 matching lines @@
     bool was_blocked;
     ASSERT_TRUE(ExecuteScriptAndExtractBool(
         shell()->web_contents(),
         base::StringPrintf("sendRequest(\"%s\");", resource), &was_blocked));
     ASSERT_FALSE(was_blocked);
 
     InspectHistograms(histograms, false, resource);
   }
 }
 
-// TODO(dsjang): we cannot run these tests on Android since SetUpCommandLine()
-// is executed before the I/O thread is created on Android. After this bug
-// (crbug.com/278425) is resolved, we can enable this test case on Android.
-#if defined(OS_ANDROID)
-#define MAYBE_CrossSiteDocumentBlockingForDifferentTargets \
-  DISABLED_CrossSiteDocumentBlockingForDifferentTargets
-#else
-#define MAYBE_CrossSiteDocumentBlockingForDifferentTargets \
-  CrossSiteDocumentBlockingForDifferentTargets
-#endif
-
 IN_PROC_BROWSER_TEST_F(SiteIsolationStatsGathererBrowserTest,
-                       MAYBE_CrossSiteDocumentBlockingForDifferentTargets) {
+                       CrossSiteDocumentBlockingForDifferentTargets) {
   // This webpage loads a cross-site HTML page in different targets such as
   // <img>,<link>,<embed>, etc. Since the requested document is blocked, and one
   // character string (' ') is returned instead, this tests that the renderer
   // does not crash even when it receives a response body which is " ", whose
   // length is different from what's described in "content-length" for such
   // different targets.
 
   // TODO(nick): Split up these cases, and add positive assertions here about
   // what actually happens in these various resource-block cases.
-  GURL foo("http://foo.com/files/cross_site_document_request_target.html");
+  GURL foo("http://foo.com/cross_site_document_request_target.html");
   NavigateToURL(shell(), foo);
 }
 
 }  // namespace content