[CORS-RFC1918] Move feature to content/.

As noticed in crrev.com/c/2339972, the feature is not used in
services/network anymore, only in content/. This change makes good on my
promise in that CL to fix this state of things in a follow-up CL.

Bug: chromium:986744
Change-Id: I633011b9eb6f5129dac0a31bdef4f0e9471c64e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366753
Commit-Queue: Titouan Rigoudy <titouan@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Camille Lamy <clamy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800967}

content/browser/frame_host/navigation_request.cc

@@ -4175,7 +4175,7 @@ void NavigationRequest::ReadyToCommitNavigation(CommitPageType type) {
             url::Origin::Create(common_params_->url));
 
     if (base::FeatureList::IsEnabled(
-            network::features::kBlockInsecurePrivateNetworkRequests)) {
+            features::kBlockInsecurePrivateNetworkRequests)) {
       ContentBrowserClient* client = GetContentClient()->browser();
       BrowserContext* context =
           frame_tree_node_->navigator().GetController()->GetBrowserContext();

content/browser/frame_host/render_frame_host_impl_browsertest.cc

@@ -3843,7 +3843,7 @@ class RenderFrameHostImplBrowserTestWithInsecurePrivateNetworkRequestsBlocked
  public:
   RenderFrameHostImplBrowserTestWithInsecurePrivateNetworkRequestsBlocked() {
     feature_list_.InitAndEnableFeature(
-        network::features::kBlockInsecurePrivateNetworkRequests);
+        features::kBlockInsecurePrivateNetworkRequests);
   }
 
  private:

content/child/runtime_features.cc

@@ -355,8 +355,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
   // function and using feature string name with EnableFeatureFromString.
   const RuntimeFeatureToChromiumFeatureMap<const char*>
       runtimeFeatureNameToChromiumFeatureMapping[] = {
-          {"AddressSpace",
-           network::features::kBlockInsecurePrivateNetworkRequests,
+          {"AddressSpace", features::kBlockInsecurePrivateNetworkRequests,
            kEnableOnly},
           {"AllowContentInitiatedDataUrlNavigations",
            features::kAllowContentInitiatedDataUrlNavigations,

content/public/common/content_features.cc

@@ -89,6 +89,14 @@ const base::Feature kBackForwardCacheMemoryControl{
 const base::Feature kBlockCredentialedSubresources{
     "BlockCredentialedSubresources", base::FEATURE_ENABLED_BY_DEFAULT};
 
+// When kBlockInsecurePrivateNetworkRequests is enabled, requests initiated
+// from a less-private network may only target a more-private network if the
+// initiating context is secure.
+//
+// https://wicg.github.io/cors-rfc1918/#integration-fetch
+const base::Feature kBlockInsecurePrivateNetworkRequests{
+    "BlockInsecurePrivateNetworkRequests", base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Use ThreadPriority::DISPLAY for browser UI and IO threads.
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 const base::Feature kBrowserUseDisplayThreadPriority{

content/public/common/content_features.h

@@ -29,6 +29,7 @@ CONTENT_EXPORT extern const base::Feature kBackgroundFetch;
 CONTENT_EXPORT extern const base::Feature kBackForwardCache;
 CONTENT_EXPORT extern const base::Feature kBackForwardCacheMemoryControl;
 CONTENT_EXPORT extern const base::Feature kBlockCredentialedSubresources;
+CONTENT_EXPORT extern const base::Feature kBlockInsecurePrivateNetworkRequests;
 CONTENT_EXPORT extern const base::Feature kBrowserUseDisplayThreadPriority;
 CONTENT_EXPORT extern const base::Feature
     kBrowserVerifiedUserActivationKeyboard;

services/network/public/cpp/features.cc

@@ -118,14 +118,6 @@ const base::Feature kCrossOriginEmbedderPolicy{
 const base::Feature kCrossOriginIsolated{"CrossOriginIsolated",
                                          base::FEATURE_DISABLED_BY_DEFAULT};
 
-// When kBlockInsecurePrivateNetworkRequests is enabled, requests initiated
-// from a less-private network may only target a more-private network if the
-// initiating context is secure.
-//
-// https://wicg.github.io/cors-rfc1918/#integration-fetch
-const base::Feature kBlockInsecurePrivateNetworkRequests{
-    "BlockInsecurePrivateNetworkRequests", base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Enables or defaults splittup up server (not proxy) entries in the
 // HttpAuthCache.
 const base::Feature kSplitAuthCacheByNetworkIsolationKey{

services/network/public/cpp/features.h

@@ -47,8 +47,6 @@ extern const base::Feature kCrossOriginEmbedderPolicy;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kCrossOriginIsolated;
 COMPONENT_EXPORT(NETWORK_CPP)
-extern const base::Feature kBlockInsecurePrivateNetworkRequests;
-COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kSplitAuthCacheByNetworkIsolationKey;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kDnsOverHttpsUpgrade;