Disable Feature-Policy HTTP Header

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index c98bbdce9b53c2b801a90037297c849d1112ff61..2152dcb828f3d02ecd20c9594110a026e9265f7f 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -1110,8 +1110,14 @@ void DocumentLoader::InstallNewDocument(
   // FeaturePolicy is reset in the browser process on commit, so this needs to
   // be initialized and replicated to the browser process after commit messages
   // are sent in didCommitNavigation().
+  // Feature-Policy header is currently disabled while the details of the policy
+  // syntax are being worked out. Unless the Feature Policy experimental
+  // features flag is enabled, then ignore any header received.
+  // TODO(iclelland): Re-enable once the syntax is finalized. (crbug.com/737643)
   document->SetFeaturePolicy(
-      response_.HttpHeaderField(HTTPNames::Feature_Policy));
+      RuntimeEnabledFeatures::FeaturePolicyExperimentalFeaturesEnabled()
+          ? response_.HttpHeaderField(HTTPNames::Feature_Policy)
+          : g_empty_string);
 
   GetFrameLoader().DispatchDidClearDocumentOfWindowObject();
 }