[client hints]: Sync browser/renderer FeaturePolicyForClientHints flag

Change-Id: I13376d67fadeed4b7fe6e6c4114876d4a21c10ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090338
Commit-Queue: Maksim Orlovich <morlovich@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747773}

chrome/browser/sessions/better_session_restore_browsertest.cc

@@ -885,13 +885,6 @@ class NoClientHintRestoreTest : public NoSessionRestoreTest {
     scoped_feature_list_.InitWithFeatureList(EnabledFeatures());
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    // TODO(aarontag): tie FeaturePolicyForClientHints runtime feature and blink
-    // feature together
-    command_line->AppendSwitchASCII(switches::kEnableBlinkFeatures,
-                                    "FeaturePolicyForClientHints");
-  }
-
   std::unique_ptr<base::FeatureList> EnabledFeatures() {
     std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
     feature_list->InitializeFromCommandLine("FeaturePolicyForClientHints", "");

content/child/runtime_features.cc

@@ -345,6 +345,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
            kUseFeatureState},
           {"CustomElementsV0", blink::features::kWebComponentsV0Enabled,
            kEnableOnly},
+          {"FeaturePolicyForClientHints",
+           features::kFeaturePolicyForClientHints, kUseFeatureState},
           {"FontSrcLocalMatching", features::kFontSrcLocalMatching,
            kUseFeatureState},
           {"HTMLImports", blink::features::kWebComponentsV0Enabled,

third_party/blink/web_tests/VirtualTestSuites

@@ -726,7 +726,6 @@
     "prefix": "legacy-client-hints-no-fp-delegation",
     "bases": [ "external/wpt/client-hints" ],
     "args": [ "--enable-features=AllowClientHintsToThirdParty",
-              "--disable-blink-features=FeaturePolicyForClientHints",
               "--disable-features=FeaturePolicyForClientHints" ]
   },
   {