Small fixes for Servicified SW code path

content/common/service_worker/service_worker_utils.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 "content/common/service_worker/service_worker_utils.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/origin_util.h"
 
 namespace content {
 
 namespace {
 
 bool PathContainsDisallowedCharacter(const GURL& url) {
   std::string path = url.path();
   DCHECK(base::IsStringUTF8(path));
 
@@ skipping 104 matching lines @@
   }
   const GURL& first = urls.front();
   for (const GURL& url : urls) {
     if (first.GetOrigin() != url.GetOrigin())
       return false;
   }
   return true;
 }
 
 // static
+bool ServiceWorkerUtils::IsServicificationEnabled() {
+  return IsBrowserSideNavigationEnabled() &&
+         base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kEnableNetworkService);
+}
+
+// static
 bool ServiceWorkerUtils::IsMojoForServiceWorkerEnabled() {
   return true;
 }
 
 bool LongestScopeMatcher::MatchLongest(const GURL& scope) {
   if (!ServiceWorkerUtils::ScopeMatches(scope, url_))
     return false;
   if (match_.is_empty() || match_.spec().size() < scope.spec().size()) {
     match_ = scope;
     return true;
   }
   return false;
 }
 
 }  // namespace content