Rename navigationPreload of FetchEvent to preloadResponse

content/browser/service_worker/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.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 1532 matching lines @@
     request_log_.push_back(request.relative_url);
   }
 
   std::vector<std::string> request_log_;
 };
 
 const char ServiceWorkerNavigationPreloadTest::kPreloadResponseTestScript[] =
     "var preload_resolve;\n"
     "var preload_promise = new Promise(r => { preload_resolve = r; });\n"
     "self.addEventListener('fetch', event => {\n"
-    "    event.waitUntil(event.navigationPreload.then(\n"
+    "    event.waitUntil(event.preloadResponse.then(\n"
     "        r => {\n"
     "          if (!r) {\n"
     "            preload_resolve(\n"
     "                {result: 'RESOLVED', info: 'Resolved with ' + r + '.'});\n"
     "            return;\n"
     "          }\n"
     "          var info = {};\n"
     "          info.type = r.type;\n"
     "          info.url = r.url;\n"
     "          info.status = r.status;\n"
@@ skipping 56 matching lines @@
   // See: https://github.com/w3c/ServiceWorker/issues/920#issuecomment-251150270
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
                        RespondWithNavigationPreload) {
   const char kPageUrl[] = "/service_worker/navigation_preload.html";
   const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
   const char kPage[] = "<title>PASS</title>Hello world.";
   const char kScript[] =
       "self.addEventListener('fetch', event => {\n"
-      "    if (!event.navigationPreload) {\n"
+      "    if (!event.preloadResponse) {\n"
       "      event.respondWith(\n"
       "          new Response('<title>ERROR</title>',"
       "                       {headers: [['content-type', 'text/html']]}));\n"
       "      return;\n"
       "    }\n"
-      "    event.respondWith(event.navigationPreload);\n"
+      "    event.respondWith(event.preloadResponse);\n"
       "  });";
   const GURL page_url = embedded_test_server()->GetURL(kPageUrl);
   const GURL worker_url = embedded_test_server()->GetURL(kWorkerUrl);
   RegisterStaticFile(page_url, kPage, "text/html");
   RegisterStaticFile(worker_url, kScript, "text/javascript");
 
   SetupForNavigationPreloadTest(page_url, worker_url,
                                 true /* enable_navigation_preload */);
 
   const base::string16 title = base::ASCIIToUTF16("PASS");
@@ skipping 10 matching lines @@
   // See: https://github.com/w3c/ServiceWorker/issues/920#issuecomment-251150270
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, GetResponseText) {
   const char kPageUrl[] = "/service_worker/navigation_preload.html";
   const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
   const char kPage[] = "<title>PASS</title>Hello world.";
   const char kScript[] =
       "self.addEventListener('fetch', event => {\n"
       "    event.respondWith(\n"
-      "        event.navigationPreload\n"
+      "        event.preloadResponse\n"
       "          .then(response => response.text())\n"
       "          .then(text =>\n"
       "                  new Response(\n"
       "                      text,\n"
       "                      {headers: [['content-type', 'text/html']]})));\n"
       "  });";
   const GURL page_url = embedded_test_server()->GetURL(kPageUrl);
   const GURL worker_url = embedded_test_server()->GetURL(kWorkerUrl);
   RegisterStaticFile(page_url, kPage, "text/html");
   RegisterStaticFile(worker_url, kScript, "text/javascript");
@@ skipping 10 matching lines @@
   // The page request must be sent only once, since the worker responded with
   // "Hello world".
   EXPECT_EQ(1, GetRequestCount(kPageUrl));
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
                        AbortPreloadRequest) {
   const char kPageUrl[] = "/service_worker/navigation_preload.html";
   const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
   const char kPage[] = "<title>ERROR</title>Hello world.";
-  // In this script, event.navigationPreload is not guarded by event.waitUntil.
+  // In this script, event.preloadResponse is not guarded by event.waitUntil.
   // So the preload request should be canceled, when the fetch event handler
   // has been executed.
   const char kScript[] =
       "var preload_resolve;\n"
       "var preload_promise = new Promise(r => { preload_resolve = r; });\n"
       "self.addEventListener('fetch', event => {\n"
-      "    event.navigationPreload.then(\n"
+      "    event.preloadResponse.then(\n"
       "        _ => { preload_resolve({result: 'RESOLVED',\n"
       "                                info: 'Preload resolved.'}); },\n"
       "        e => { preload_resolve({result: 'REJECTED',\n"
       "                                info: e.toString()}); });\n"
       "    event.respondWith(\n"
       "        new Response(\n"
       "            '<title>WAITING</title><script>\\n' +\n"
       "            'var channel = new MessageChannel();\\n' +\n"
       "            'channel.port1.onmessage = e => {\\n' +\n"
       "            '    var div = document.createElement(\\'div\\');\\n' +\n"
@@ skipping 916 matching lines @@
                         ServiceWorkerV8CacheStrategiesNormalTest,
                         ::testing::Values(true, false));
 INSTANTIATE_TEST_CASE_P(ServiceWorkerBrowserTest,
                         ServiceWorkerV8CacheStrategiesAggressiveTest,
                         ::testing::Values(true, false));
 INSTANTIATE_TEST_CASE_P(ServiceWorkerBrowserTest,
                         ServiceWorkerDisableWebSecurityTest,
                         ::testing::Values(true, false));
 
 }  // namespace content