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

chrome/browser/chrome_service_worker_browsertest.cc

 // Copyright 2014 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.
 
 // This file tests that Service Workers (a Content feature) work in the Chromium
 // embedder.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 416 matching lines @@
   void SetUpOnMainThread() override {
     base::FilePath document_root;
     ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
     embedded_test_server()->AddDefaultHandlers(
         document_root.Append(FILE_PATH_LITERAL("nacl_test_data"))
             .Append(FILE_PATH_LITERAL("pnacl")));
     ChromeServiceWorkerFetchTest::SetUpOnMainThread();
     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"),
                          "same-origin", "include");
   }
 
   std::string ExecutePNACLUrlLoaderTest(const std::string& mode) {
     std::string result(ExecuteScriptAndExtractString(
         base::StringPrintf("reportOnFetch = false;"
                            "var iframe = document.createElement('iframe');"
                            "iframe.src='%s#%s';"
                            "document.body.appendChild(iframe);",
                            test_page_url_.c_str(), mode.c_str())));
     EXPECT_EQ(base::StringPrintf("OnOpen%s", mode.c_str()), result);
     return ExecuteScriptAndExtractString("reportRequests();");
   }
 
  private:
   std::string test_page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeServiceWorkerFetchPPAPITest);
 };
 
 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"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, SameOriginCORS) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   request.SetURL("/echo");
   //   request.SetAllowCrossOriginRequests(true);
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCORS") +
                 RequestString(GetURL("/echo"), "cors", "same-origin"),
             ExecutePNACLUrlLoaderTest("SameCORS"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
                        SameOriginCredentials) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   request.SetURL("/echo");
   //   request.SetAllowCredentials(true);
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCredentials") +
                 RequestString(GetURL("/echo"), "same-origin", "include"),
             ExecutePNACLUrlLoaderTest("SameCredentials"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
                        SameOriginCORSCredentials) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   request.SetURL("/echo");
   //   request.SetAllowCrossOriginRequests(true);
   //   request.SetAllowCredentials(true);
-  EXPECT_EQ(GetRequestStringForPNACL() +
+  EXPECT_EQ(GetRequestStringForPNACL("#SameCORSCredentials") +
                 RequestString(GetURL("/echo"), "cors", "include"),
             ExecutePNACLUrlLoaderTest("SameCORSCredentials"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest, OtherOrigin) {
   // In pnacl_url_loader.cc:
   //   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) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   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"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
                        OtherOriginCredentials) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   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"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPITest,
                        OtherOriginCORSCredentials) {
   // In pnacl_url_loader.cc:
   //   request.SetMethod("GET");
   //   request.SetURL("https://www.example.com/echo");
   //   request.SetAllowCrossOriginRequests(true);
   //   request.SetAllowCredentials(true);
   EXPECT_EQ(
-      GetRequestStringForPNACL() +
+      GetRequestStringForPNACL("#OtherCORSCredentials") +
           RequestString("https://www.example.com/echo", "cors", "include"),
       ExecutePNACLUrlLoaderTest("OtherCORSCredentials"));
 }
 
 class ChromeServiceWorkerFetchPPAPIPrivateTest
     : public ChromeServiceWorkerFetchPPAPITest {
  protected:
   ChromeServiceWorkerFetchPPAPIPrivateTest() {}
   ~ChromeServiceWorkerFetchPPAPIPrivateTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ChromeServiceWorkerFetchPPAPITest::SetUpCommandLine(command_line);
     // Sets this flag to test that the fetch request from the plugins with
     // private permission (PERMISSION_PRIVATE) should not go to the service
     // worker.
     command_line->AppendSwitch(switches::kEnablePepperTesting);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(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"));
 }
 
 }  // namespace