OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/media/webrtc/media_stream_device_permission_context.h" | 5 #include "chrome/browser/media/webrtc/media_stream_device_permission_context.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/test/scoped_feature_list.h" | 9 #include "base/test/scoped_feature_list.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 HostContentSettingsMapFactory::GetForProfile(profile()) | 60 HostContentSettingsMapFactory::GetForProfile(profile()) |
61 ->GetContentSetting(secure_url.GetOrigin(), | 61 ->GetContentSetting(secure_url.GetOrigin(), |
62 insecure_url.GetOrigin(), | 62 insecure_url.GetOrigin(), |
63 content_settings_type, std::string())); | 63 content_settings_type, std::string())); |
64 EXPECT_EQ(CONTENT_SETTING_ASK, | 64 EXPECT_EQ(CONTENT_SETTING_ASK, |
65 HostContentSettingsMapFactory::GetForProfile(profile()) | 65 HostContentSettingsMapFactory::GetForProfile(profile()) |
66 ->GetContentSetting(insecure_url.GetOrigin(), | 66 ->GetContentSetting(insecure_url.GetOrigin(), |
67 secure_url.GetOrigin(), | 67 secure_url.GetOrigin(), |
68 content_settings_type, std::string())); | 68 content_settings_type, std::string())); |
69 | 69 |
70 EXPECT_EQ(CONTENT_SETTING_ASK, | 70 { |
71 permission_context | 71 // TODO(raymes): Remove this when crbug.com/526324 is fixed. |
72 .GetPermissionStatus(nullptr /* render_frame_host */, | 72 base::test::ScopedFeatureList scoped_feature_list; |
73 insecure_url, insecure_url) | 73 scoped_feature_list.InitAndDisableFeature( |
74 .content_setting); | 74 features::kRequireSecureOriginsForPepperMediaRequests); |
| 75 EXPECT_EQ(CONTENT_SETTING_ASK, |
| 76 permission_context |
| 77 .GetPermissionStatus(nullptr /* render_frame_host */, |
| 78 insecure_url, insecure_url) |
| 79 .content_setting); |
75 | 80 |
76 EXPECT_EQ(CONTENT_SETTING_ASK, | 81 EXPECT_EQ(CONTENT_SETTING_ASK, |
77 permission_context | 82 permission_context |
78 .GetPermissionStatus(nullptr /* render_frame_host */, | 83 .GetPermissionStatus(nullptr /* render_frame_host */, |
79 insecure_url, secure_url) | 84 insecure_url, secure_url) |
80 .content_setting); | 85 .content_setting); |
81 | 86 } |
82 base::test::ScopedFeatureList scoped_feature_list; | |
83 scoped_feature_list.InitAndEnableFeature( | |
84 features::kRequireSecureOriginsForPepperMediaRequests); | |
85 | 87 |
86 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 88 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
87 permission_context | 89 permission_context |
88 .GetPermissionStatus(nullptr /* render_frame_host */, | 90 .GetPermissionStatus(nullptr /* render_frame_host */, |
89 insecure_url, insecure_url) | 91 insecure_url, insecure_url) |
90 .content_setting); | 92 .content_setting); |
91 | 93 |
92 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 94 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
93 permission_context | 95 permission_context |
94 .GetPermissionStatus(nullptr /* render_frame_host */, | 96 .GetPermissionStatus(nullptr /* render_frame_host */, |
95 insecure_url, secure_url) | 97 insecure_url, secure_url) |
96 .content_setting); | 98 .content_setting); |
97 } | 99 } |
98 | 100 |
99 void TestSecureQueryingUrl(ContentSettingsType content_settings_type) { | 101 void TestSecureQueryingUrl(ContentSettingsType content_settings_type) { |
100 TestPermissionContext permission_context(profile(), content_settings_type); | 102 TestPermissionContext permission_context(profile(), content_settings_type); |
101 GURL secure_url("https://www.example.com"); | 103 GURL secure_url("https://www.example.com"); |
102 | 104 |
103 // Check that there is no saved content settings. | 105 // Check that there is no saved content settings. |
104 EXPECT_EQ(CONTENT_SETTING_ASK, | 106 EXPECT_EQ(CONTENT_SETTING_ASK, |
105 HostContentSettingsMapFactory::GetForProfile(profile()) | 107 HostContentSettingsMapFactory::GetForProfile(profile()) |
106 ->GetContentSetting(secure_url.GetOrigin(), | 108 ->GetContentSetting(secure_url.GetOrigin(), |
107 secure_url.GetOrigin(), | 109 secure_url.GetOrigin(), |
108 content_settings_type, | 110 content_settings_type, |
109 std::string())); | 111 std::string())); |
110 | 112 |
| 113 { |
| 114 // TODO(raymes): Remove this when crbug.com/526324 is fixed. |
| 115 base::test::ScopedFeatureList scoped_feature_list; |
| 116 scoped_feature_list.InitAndDisableFeature( |
| 117 features::kRequireSecureOriginsForPepperMediaRequests); |
| 118 EXPECT_EQ(CONTENT_SETTING_ASK, |
| 119 permission_context |
| 120 .GetPermissionStatus(nullptr /* render_frame_host */, |
| 121 secure_url, secure_url) |
| 122 .content_setting); |
| 123 } |
| 124 |
111 EXPECT_EQ(CONTENT_SETTING_ASK, | 125 EXPECT_EQ(CONTENT_SETTING_ASK, |
112 permission_context | 126 permission_context |
113 .GetPermissionStatus(nullptr /* render_frame_host */, | 127 .GetPermissionStatus(nullptr /* render_frame_host */, |
114 secure_url, secure_url) | |
115 .content_setting); | |
116 | |
117 base::test::ScopedFeatureList scoped_feature_list; | |
118 scoped_feature_list.InitAndEnableFeature( | |
119 features::kRequireSecureOriginsForPepperMediaRequests); | |
120 EXPECT_EQ(CONTENT_SETTING_ASK, | |
121 permission_context | |
122 .GetPermissionStatus(nullptr /* render_frame_host */, | |
123 secure_url, secure_url) | 128 secure_url, secure_url) |
124 .content_setting); | 129 .content_setting); |
125 } | 130 } |
126 | 131 |
127 private: | 132 private: |
128 // ChromeRenderViewHostTestHarness: | 133 // ChromeRenderViewHostTestHarness: |
129 void SetUp() override { | 134 void SetUp() override { |
130 ChromeRenderViewHostTestHarness::SetUp(); | 135 ChromeRenderViewHostTestHarness::SetUp(); |
131 #if defined(OS_ANDROID) | 136 #if defined(OS_ANDROID) |
132 InfoBarService::CreateForWebContents(web_contents()); | 137 InfoBarService::CreateForWebContents(web_contents()); |
(...skipping 19 matching lines...) Expand all Loading... |
152 | 157 |
153 // MEDIASTREAM_MIC permission status should be ask for Secure origin. | 158 // MEDIASTREAM_MIC permission status should be ask for Secure origin. |
154 TEST_F(MediaStreamDevicePermissionContextTests, TestMicSecureQueryingUrl) { | 159 TEST_F(MediaStreamDevicePermissionContextTests, TestMicSecureQueryingUrl) { |
155 TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); | 160 TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); |
156 } | 161 } |
157 | 162 |
158 // MEDIASTREAM_CAMERA permission status should be ask for Secure origin. | 163 // MEDIASTREAM_CAMERA permission status should be ask for Secure origin. |
159 TEST_F(MediaStreamDevicePermissionContextTests, TestCameraSecureQueryingUrl) { | 164 TEST_F(MediaStreamDevicePermissionContextTests, TestCameraSecureQueryingUrl) { |
160 TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); | 165 TestSecureQueryingUrl(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); |
161 } | 166 } |
OLD | NEW |