Enable ServiceWorkerNavigationPreload by default

content/browser/service_worker/service_worker_version.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_version.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
-#include "base/feature_list.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 11 matching lines @@
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/common/origin_trials/trial_token_validator.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/common/service_worker/embedded_worker_start_params.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 
 namespace content {
 
 using StatusCallback = ServiceWorkerVersion::StatusCallback;
 
@@ skipping 996 matching lines @@
   if (!request)
     return;
   // Copy error callback before calling FinishRequest.
   StatusCallback callback = request->error_callback;
 
   FinishRequest(request_id, status == SERVICE_WORKER_OK, dispatch_event_time);
 
   callback.Run(status);
 }
 
-ServiceWorkerVersion::NavigationPreloadSupportStatus
-ServiceWorkerVersion::GetNavigationPreloadSupportStatus() const {
-  // The origin trial of Navigation Preload started from M57. And the worker
-  // entry in the database written by Chrome (>= M56) must have the
-  // origin_trial_tokens field.
-  const bool has_valid_token =
-      origin_trial_tokens_ &&
-      base::ContainsKey(*origin_trial_tokens_,
-                        "ServiceWorkerNavigationPreload");
-  if (!has_valid_token) {
-    if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(
-            features::kServiceWorkerNavigationPreload.name,
-            base::FeatureList::OVERRIDE_ENABLE_FEATURE)) {
-      return NavigationPreloadSupportStatus::SUPPORTED;
-    } else {
-      return NavigationPreloadSupportStatus::
-          NOT_SUPPORTED_NO_VALID_ORIGIN_TRIAL_TOKEN;
-    }
-  }
-  if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(
-          features::kServiceWorkerNavigationPreload.name,
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE)) {
-    return NavigationPreloadSupportStatus::SUPPORTED;
-  }
-  if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(
-          features::kServiceWorkerNavigationPreload.name,
-          base::FeatureList::OVERRIDE_DISABLE_FEATURE)) {
-    return NavigationPreloadSupportStatus::
-        NOT_SUPPORTED_DISABLED_BY_COMMAND_LINE;
-  }
-  if (base::FeatureList::IsEnabled(features::kServiceWorkerNavigationPreload)) {
-    return NavigationPreloadSupportStatus::SUPPORTED;
-  }
-  return NavigationPreloadSupportStatus::NOT_SUPPORTED_FIELD_TRIAL_STOPPED;
-}
-
 void ServiceWorkerVersion::CountFeature(uint32_t feature) {
   if (!used_features_.insert(feature).second)
     return;
   for (auto provider_host_by_uuid : controllee_map_)
     provider_host_by_uuid.second->CountFeature(feature);
 }
 
 void ServiceWorkerVersion::OnOpenWindow(int request_id, GURL url) {
   // Just abort if we are shutting down.
   if (!context_)
@@ skipping 768 matching lines @@
 
 void ServiceWorkerVersion::CleanUpExternalRequest(
     const std::string& request_uuid,
     ServiceWorkerStatusCode status) {
   if (status == SERVICE_WORKER_OK)
     return;
   external_request_uuid_to_request_id_.erase(request_uuid);
 }
 
 }  // namespace content