Flip the kRequireSecureOriginsForPepperMediaRequests to enabled by default

chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc

 // Copyright 2015 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 "chrome/browser/media/webrtc/media_stream_device_permission_context.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
@@ skipping 49 matching lines @@
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(secure_url.GetOrigin(),
                                       insecure_url.GetOrigin(),
                                       content_settings_type, std::string()));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(insecure_url.GetOrigin(),
                                       secure_url.GetOrigin(),
                                       content_settings_type, std::string()));
 
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              permission_context
-                  .GetPermissionStatus(nullptr /* render_frame_host */,
-                                       insecure_url, insecure_url)
-                  .content_setting);
+    {
+      // TODO(raymes): Remove this when crbug.com/526324 is fixed.
+      base::test::ScopedFeatureList scoped_feature_list;
+      scoped_feature_list.InitAndDisableFeature(
+          features::kRequireSecureOriginsForPepperMediaRequests);
+      EXPECT_EQ(CONTENT_SETTING_ASK,
+                permission_context
+                    .GetPermissionStatus(nullptr /* render_frame_host */,
+                                         insecure_url, insecure_url)
+                    .content_setting);
 
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              permission_context
-                  .GetPermissionStatus(nullptr /* render_frame_host */,
-                                       insecure_url, secure_url)
-                  .content_setting);
-
-    base::test::ScopedFeatureList scoped_feature_list;
-    scoped_feature_list.InitAndEnableFeature(
-        features::kRequireSecureOriginsForPepperMediaRequests);
+      EXPECT_EQ(CONTENT_SETTING_ASK,
+                permission_context
+                    .GetPermissionStatus(nullptr /* render_frame_host */,
+                                         insecure_url, secure_url)
+                    .content_setting);
+    }
 
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               permission_context
                   .GetPermissionStatus(nullptr /* render_frame_host */,
                                        insecure_url, insecure_url)
                   .content_setting);
 
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               permission_context
                   .GetPermissionStatus(nullptr /* render_frame_host */,
                                        insecure_url, secure_url)
                   .content_setting);
   }
 
   void TestSecureQueryingUrl(ContentSettingsType content_settings_type) {
     TestPermissionContext permission_context(profile(), content_settings_type);
     GURL secure_url("https://www.example.com");
 
     // Check that there is no saved content settings.
     EXPECT_EQ(CONTENT_SETTING_ASK,
               HostContentSettingsMapFactory::GetForProfile(profile())
                   ->GetContentSetting(secure_url.GetOrigin(),
                                       secure_url.GetOrigin(),
                                       content_settings_type,
                                       std::string()));
 
+    {
+      // TODO(raymes): Remove this when crbug.com/526324 is fixed.
+      base::test::ScopedFeatureList scoped_feature_list;
+      scoped_feature_list.InitAndDisableFeature(
+          features::kRequireSecureOriginsForPepperMediaRequests);
+      EXPECT_EQ(CONTENT_SETTING_ASK,
+                permission_context
+                    .GetPermissionStatus(nullptr /* render_frame_host */,
+                                         secure_url, secure_url)
+                    .content_setting);
+    }
+
     EXPECT_EQ(CONTENT_SETTING_ASK,
               permission_context
                   .GetPermissionStatus(nullptr /* render_frame_host */,
-                                       secure_url, secure_url)
-                  .content_setting);
-
-    base::test::ScopedFeatureList scoped_feature_list;
-    scoped_feature_list.InitAndEnableFeature(
-        features::kRequireSecureOriginsForPepperMediaRequests);
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              permission_context
-                  .GetPermissionStatus(nullptr /* render_frame_host */,
                                        secure_url, secure_url)
                   .content_setting);
   }
 
  private:
   // ChromeRenderViewHostTestHarness:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined(OS_ANDROID)
     InfoBarService::CreateForWebContents(web_contents());
@@ skipping 19 matching lines @@
 
 // MEDIASTREAM_MIC permission status should be ask for Secure origin.
 TEST_F(MediaStreamDevicePermissionContextTests, TestMicSecureQueryingUrl) {
   TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
 }
 
 // MEDIASTREAM_CAMERA permission status should be ask for Secure origin.
 TEST_F(MediaStreamDevicePermissionContextTests, TestCameraSecureQueryingUrl) {
   TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
 }