Enable ServiceWorkerNavigationPreload by default

content/browser/service_worker/service_worker_dispatcher_host.cc

 // Copyright 2013 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 "content/browser/service_worker/service_worker_dispatcher_host.h"
 
 #include <utility>
 
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
@@ skipping 62 matching lines @@
   if (!callback.is_null())
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback);
 }
 
 WebContents* GetWebContents(int render_process_id, int render_frame_id) {
   RenderFrameHost* rfh =
       RenderFrameHost::FromID(render_process_id, render_frame_id);
   return WebContents::FromRenderFrameHost(rfh);
 }
 
-std::string GetNavigationPreloadDisabledErrorMessage(
-    ServiceWorkerVersion::NavigationPreloadSupportStatus support_status) {
-  switch (support_status) {
-    case ServiceWorkerVersion::NavigationPreloadSupportStatus::SUPPORTED:
-      NOTREACHED();
-      break;
-    case ServiceWorkerVersion::NavigationPreloadSupportStatus::
-        NOT_SUPPORTED_FIELD_TRIAL_STOPPED:
-      return "The Navigation Preload Origin Trial has ended.";
-    case ServiceWorkerVersion::NavigationPreloadSupportStatus::
-        NOT_SUPPORTED_DISABLED_BY_COMMAND_LINE:
-      return "Navigation Preload is disabled by command line flag.";
-    case ServiceWorkerVersion::NavigationPreloadSupportStatus::
-        NOT_SUPPORTED_NO_VALID_ORIGIN_TRIAL_TOKEN:
-      return "The service worker script does not have a valid Navigation "
-             "Preload Origin Trial token.";
-  }
-  NOTREACHED();
-  return "";
-}
-
 }  // namespace
 
 ServiceWorkerDispatcherHost::ServiceWorkerDispatcherHost(
     int render_process_id,
     ResourceContext* resource_context)
     : BrowserMessageFilter(kFilteredMessageClasses,
                            arraysize(kFilteredMessageClasses)),
       render_process_id_(render_process_id),
       resource_context_(resource_context),
       channel_ready_(false),
@@ skipping 602 matching lines @@
   // https://github.com/w3c/ServiceWorker/issues/920#issuecomment-262212670
   // TODO(falken): Remove this comment when the spec is updated.
   if (!registration->active_version()) {
     Send(new ServiceWorkerMsg_EnableNavigationPreloadError(
         thread_id, request_id, WebServiceWorkerError::kErrorTypeState,
         std::string(kEnableNavigationPreloadErrorPrefix) +
             std::string(kNoActiveWorkerErrorMessage)));
     return;
   }
 
-  ServiceWorkerVersion::NavigationPreloadSupportStatus support_status =
-      registration->active_version()->GetNavigationPreloadSupportStatus();
-  if (support_status !=
-      ServiceWorkerVersion::NavigationPreloadSupportStatus::SUPPORTED) {
-    Send(new ServiceWorkerMsg_EnableNavigationPreloadError(
-        thread_id, request_id, WebServiceWorkerError::kErrorTypeAbort,
-        std::string(kEnableNavigationPreloadErrorPrefix) +
-            GetNavigationPreloadDisabledErrorMessage(support_status)));
-    return;
-  }
-
   std::vector<GURL> urls = {provider_host->document_url(),
                             registration->pattern()};
   if (!ServiceWorkerUtils::AllOriginsMatchAndCanAccessServiceWorkers(urls)) {
     bad_message::ReceivedBadMessage(
         this, bad_message::SWDH_ENABLE_NAVIGATION_PRELOAD_INVALID_ORIGIN);
     return;
   }
 
   if (!GetContentClient()->browser()->AllowServiceWorker(
           registration->pattern(), provider_host->topmost_frame_url(),
@@ skipping 122 matching lines @@
   // https://github.com/w3c/ServiceWorker/issues/920#issuecomment-262212670
   // TODO(falken): Remove this comment when the spec is updated.
   if (!registration->active_version()) {
     Send(new ServiceWorkerMsg_SetNavigationPreloadHeaderError(
         thread_id, request_id, WebServiceWorkerError::kErrorTypeState,
         std::string(kSetNavigationPreloadHeaderErrorPrefix) +
             std::string(kNoActiveWorkerErrorMessage)));
     return;
   }
 
-  ServiceWorkerVersion::NavigationPreloadSupportStatus support_status =
-      registration->active_version()->GetNavigationPreloadSupportStatus();
-  if (support_status !=
-      ServiceWorkerVersion::NavigationPreloadSupportStatus::SUPPORTED) {
-    Send(new ServiceWorkerMsg_SetNavigationPreloadHeaderError(
-        thread_id, request_id, WebServiceWorkerError::kErrorTypeAbort,
-        std::string(kSetNavigationPreloadHeaderErrorPrefix) +
-            GetNavigationPreloadDisabledErrorMessage(support_status)));
-    return;
-  }
   std::vector<GURL> urls = {provider_host->document_url(),
                             registration->pattern()};
   if (!ServiceWorkerUtils::AllOriginsMatchAndCanAccessServiceWorkers(urls)) {
     bad_message::ReceivedBadMessage(
         this, bad_message::SWDH_SET_NAVIGATION_PRELOAD_HEADER_INVALID_ORIGIN);
     return;
   }
 
   // TODO(falken): Ideally this would match Blink's isValidHTTPHeaderValue.
   // Chrome's check is less restrictive: it allows non-latin1 characters.
@@ skipping 881 matching lines @@
   if (!handle) {
     bad_message::ReceivedBadMessage(this,
                                     bad_message::SWDH_TERMINATE_BAD_HANDLE);
     return;
   }
   handle->version()->StopWorker(
       base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
 }
 
 }  // namespace content