Fetch API: Don't exclude the URL fragment in Request#url

chrome/browser/chrome_service_worker_browsertest.cc

Index: chrome/browser/chrome_service_worker_browsertest.cc
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc
index d0c862ba36cd39e184a60df57cb2ddbd69678dad..9f4b5d350ccd18a662ce63f67d644fc1c22c570c 100644
--- a/chrome/browser/chrome_service_worker_browsertest.cc
+++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -434,8 +434,9 @@ class ChromeServiceWorkerFetchPPAPITest : public ChromeServiceWorkerFetchTest {
     test_page_url_ = GetURL("/pnacl_url_loader.html");
   }
 
-  std::string GetRequestStringForPNACL() const {
-    return RequestString(test_page_url_, "navigate", "include") +
+  std::string GetRequestStringForPNACL(const std::string& fragment) const {
+    return RequestString(test_page_url_ + fragment.c_str(), "navigate",

[falken, 2017/03/31 06:40:49]

nit: I don't think you need the c_str()?

[yiyix, 2017/03/31 07:24:02]

Done.

+                         "include") +
            RequestString(GetURL("/pnacl_url_loader.nmf"), "same-origin",
                          "include") +
            RequestString(GetURL("/pnacl_url_loader_newlib_pnacl.pexe"),
@@ -463,7 +464,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, SameOrigin) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   request.SetURL("/echo");
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#Same") +
                 RequestString(GetURL("/echo"), "same-origin", "include"),
             ExecutePNACLUrlLoaderTest("Same"));
 }
@@ -473,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, SameOriginCORS) {
   //   request.SetMethod("GET");
   //   request.SetURL("/echo");
   //   request.SetAllowCrossOriginRequests(true);
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCORS") +
                 RequestString(GetURL("/echo"), "cors", "same-origin"),
             ExecutePNACLUrlLoaderTest("SameCORS"));
 }
@@ -484,7 +485,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
   //   request.SetMethod("GET");
   //   request.SetURL("/echo");
   //   request.SetAllowCredentials(true);
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCredentials") +
                 RequestString(GetURL("/echo"), "same-origin", "include"),
             ExecutePNACLUrlLoaderTest("SameCredentials"));
 }
@@ -496,7 +497,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
   //   request.SetURL("/echo");
   //   request.SetAllowCrossOriginRequests(true);
   //   request.SetAllowCredentials(true);
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCORSCredentials") +
                 RequestString(GetURL("/echo"), "cors", "include"),
             ExecutePNACLUrlLoaderTest("SameCORSCredentials"));
 }
@@ -506,7 +507,8 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, OtherOrigin) {
   //   request.SetMethod("GET");
   //   request.SetURL("https://www.example.com/echo");
   // This request fails because AllowCrossOriginRequests is not set.
-  EXPECT_EQ(GetRequestStringForPNACL(), ExecutePNACLUrlLoaderTest("Other"));
+  EXPECT_EQ(GetRequestStringForPNACL("#Other"),
+            ExecutePNACLUrlLoaderTest("Other"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, OtherOriginCORS) {
@@ -515,7 +517,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, OtherOriginCORS) {
   //   request.SetURL("https://www.example.com/echo");
   //   request.SetAllowCrossOriginRequests(true);
   EXPECT_EQ(
-      GetRequestStringForPNACL() +
+      GetRequestStringForPNACL("#OtherCORS") +
           RequestString("https://www.example.com/echo", "cors", "same-origin"),
       ExecutePNACLUrlLoaderTest("OtherCORS"));
 }
@@ -527,7 +529,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
   //   request.SetURL("https://www.example.com/echo");
   //   request.SetAllowCredentials(true);
   // This request fails because AllowCrossOriginRequests is not set.
-  EXPECT_EQ(GetRequestStringForPNACL(),
+  EXPECT_EQ(GetRequestStringForPNACL("#OtherCredentials"),
             ExecutePNACLUrlLoaderTest("OtherCredentials"));
 }
 
@@ -539,7 +541,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
   //   request.SetAllowCrossOriginRequests(true);
   //   request.SetAllowCredentials(true);
   EXPECT_EQ(
-      GetRequestStringForPNACL() +
+      GetRequestStringForPNACL("#OtherCORSCredentials") +
           RequestString("https://www.example.com/echo", "cors", "include"),
       ExecutePNACLUrlLoaderTest("OtherCORSCredentials"));
 }
@@ -563,44 +565,48 @@ class ChromeServiceWorkerFetchPPAPIPrivateTest
 };
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest, SameOrigin) {
-  EXPECT_EQ(GetRequestStringForPNACL(), ExecutePNACLUrlLoaderTest("Same"));
+  EXPECT_EQ(GetRequestStringForPNACL("#Same"),
+            ExecutePNACLUrlLoaderTest("Same"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        SameOriginCORS) {
-  EXPECT_EQ(GetRequestStringForPNACL(), ExecutePNACLUrlLoaderTest("SameCORS"));
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCORS"),
+            ExecutePNACLUrlLoaderTest("SameCORS"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        SameOriginCredentials) {
-  EXPECT_EQ(GetRequestStringForPNACL(),
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCredentials"),
             ExecutePNACLUrlLoaderTest("SameCredentials"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        SameOriginCORSCredentials) {
-  EXPECT_EQ(GetRequestStringForPNACL(),
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCORSCredentials"),
             ExecutePNACLUrlLoaderTest("SameCORSCredentials"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest, OtherOrigin) {
-  EXPECT_EQ(GetRequestStringForPNACL(), ExecutePNACLUrlLoaderTest("Other"));
+  EXPECT_EQ(GetRequestStringForPNACL("#Other"),
+            ExecutePNACLUrlLoaderTest("Other"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        OtherOriginCORS) {
-  EXPECT_EQ(GetRequestStringForPNACL(), ExecutePNACLUrlLoaderTest("OtherCORS"));
+  EXPECT_EQ(GetRequestStringForPNACL("#OtherCORS"),
+            ExecutePNACLUrlLoaderTest("OtherCORS"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        OtherOriginCredentials) {
-  EXPECT_EQ(GetRequestStringForPNACL(),
+  EXPECT_EQ(GetRequestStringForPNACL("#OtherCredentials"),
             ExecutePNACLUrlLoaderTest("OtherCredentials"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        OtherOriginCORSCredentials) {
-  EXPECT_EQ(GetRequestStringForPNACL(),
+  EXPECT_EQ(GetRequestStringForPNACL("#OtherCORSCredentials"),
             ExecutePNACLUrlLoaderTest("OtherCORSCredentials"));
 }