Flip the kRequireSecureOriginsForPepperMediaRequests to enabled by default

chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
@@ skipping 833 matching lines @@
 }
 
 // For Pepper request from insecure origin, even if it's ALLOW, it won't be
 // changed to ASK.
 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerTest,
                        PepperRequestInsecure) {
   InitWithUrl(GURL("http://www.example.com"));
 
   SetPromptResponseType(PermissionRequestManager::ACCEPT_ALL);
 
-  RequestPermissions(
-      GetWebContents(),
-      CreateRequestWithType(example_audio_id(), std::string(),
-                            content::MEDIA_OPEN_DEVICE_PEPPER_ONLY),
-      base::Bind(&MediaStreamDevicesControllerTest::OnMediaStreamResponse,
-                 base::Unretained(this)));
-  ASSERT_EQ(2u, TotalPromptRequestCount());
+  {
+    // Test that with the kRequireSecureOriginsForPepperMediaRequests flag
+    // disabled that permission will be denied. TODO(raymes): Remove this when
+    // crbug.com/526324 is fixed.
+    base::test::ScopedFeatureList scoped_feature_list;
+    if (static_cast<TestType>(GetParam()) ==
+        TestType::TEST_WITH_GROUPED_MEDIA_REQUESTS) {
+      scoped_feature_list.InitWithFeatures(
+          {features::kUsePermissionManagerForMediaRequests},
+          {features::kRequireSecureOriginsForPepperMediaRequests});
+    } else {
+      scoped_feature_list.InitWithFeatures(
+          {}, {features::kRequireSecureOriginsForPepperMediaRequests});
+    }
+    RequestPermissions(
+        GetWebContents(),
+        CreateRequestWithType(example_audio_id(), std::string(),
+                              content::MEDIA_OPEN_DEVICE_PEPPER_ONLY),
+        base::Bind(&MediaStreamDevicesControllerTest::OnMediaStreamResponse,
+                   base::Unretained(this)));
+    ASSERT_EQ(2u, TotalPromptRequestCount());
 
-  ASSERT_EQ(content::MEDIA_DEVICE_OK, media_stream_result());
-  ASSERT_TRUE(CheckDevicesListContains(content::MEDIA_DEVICE_AUDIO_CAPTURE));
-  ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_VIDEO_CAPTURE));
+    ASSERT_EQ(content::MEDIA_DEVICE_OK, media_stream_result());
+    ASSERT_TRUE(CheckDevicesListContains(content::MEDIA_DEVICE_AUDIO_CAPTURE));
+    ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_VIDEO_CAPTURE));
+  }
 
-  // Test that with the kRequireSecureOriginsForPepperMediaRequests flag enabled
-  // that permission will be denied.
   ResetPromptCounters();
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      features::kRequireSecureOriginsForPepperMediaRequests);
   RequestPermissions(
       GetWebContents(),
       CreateRequestWithType(example_audio_id(), example_video_id(),
                             content::MEDIA_OPEN_DEVICE_PEPPER_ONLY),
       base::Bind(&MediaStreamDevicesControllerTest::OnMediaStreamResponse,
                  base::Unretained(this)));
   ASSERT_EQ(0u, TotalPromptRequestCount());
 
   ASSERT_EQ(content::MEDIA_DEVICE_PERMISSION_DENIED, media_stream_result());
   ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_AUDIO_CAPTURE));
@@ skipping 29 matching lines @@
   ASSERT_EQ(content::MEDIA_DEVICE_KILL_SWITCH_ON, media_stream_result());
   ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_AUDIO_CAPTURE));
   ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_VIDEO_CAPTURE));
 }
 
 INSTANTIATE_TEST_CASE_P(
     MediaStreamDevicesControllerTestInstance,
     MediaStreamDevicesControllerTest,
     ::testing::Values(TestType::DEFAULT,
                       TestType::TEST_WITH_GROUPED_MEDIA_REQUESTS));