Added shield removal to testing config

Bug: 987294
Change-Id: I3b66e537e9edc5420a0b6d3d1a0664ee8cbfcd63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846052Reviewed-by: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Nik Bhagat <nikunjb@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Auto-Submit: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706713}

chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc

@@ -17,6 +17,7 @@
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/fake_owner.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/common/content_settings_types.h"
@@ -35,8 +36,10 @@
 class ContentSettingBubbleModelMixedScriptTest : public InProcessBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    feature_list.InitAndDisableFeature(
-        blink::features::kMixedContentAutoupgrade);
+    feature_list.InitWithFeatures(
+        /* enabled_features */ {},
+        /* disabled_features */ {blink::features::kMixedContentAutoupgrade,
+                                 features::kMixedContentSiteSetting});
   }
 
  protected:
@@ -300,6 +303,7 @@ class ContentSettingBubbleModelMixedScriptOopifTest
     : public ContentSettingBubbleModelMixedScriptTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
+    ContentSettingBubbleModelMixedScriptTest::SetUpCommandLine(command_line);
     content::IsolateAllSitesForTesting(command_line);
   }
 

testing/variations/fieldtrial_testing_config.json

@@ -3497,6 +3497,24 @@
             ]
         }
     ],
+    "MixedContentShieldRemoval": [
+        {
+            "platforms": [
+                "chromeos",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "MixedContentSiteSetting"
+                    ]
+                }
+            ]
+        }
+    ],
     "NTPLaunchAfterInactivity": [
         {
             "platforms": [