Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Issue 588153003: Remove MediaSettingChangedInfobar and show latest state in bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove redundant is_cam Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/strings/string16.h" 5 #include "base/strings/string16.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 8 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
9 #include "chrome/test/base/testing_profile.h" 9 #include "chrome/test/base/testing_profile.h"
10 #include "content/public/test/test_browser_thread.h" 10 #include "content/public/test/test_browser_thread.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // Request and allow camera access. 219 // Request and allow camera access.
220 request_permissions.clear(); 220 request_permissions.clear();
221 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission = 221 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
222 MediaStreamDevicesController::MEDIA_ALLOWED; 222 MediaStreamDevicesController::MEDIA_ALLOWED;
223 content_settings->OnMediaStreamPermissionSet(security_origin, 223 content_settings->OnMediaStreamPermissionSet(security_origin,
224 request_permissions); 224 request_permissions);
225 ASSERT_TRUE(content_settings->IsContentAllowed( 225 ASSERT_TRUE(content_settings->IsContentAllowed(
226 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 226 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
227 ASSERT_FALSE(content_settings->IsContentBlocked( 227 ASSERT_FALSE(content_settings->IsContentBlocked(
228 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 228 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
229 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED, 229 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
230 TabSpecificContentSettings::CAMERA_ACCESSED,
230 content_settings->GetMicrophoneCameraState()); 231 content_settings->GetMicrophoneCameraState());
231 232
232 // Request and block microphone access. 233 // Request and block microphone access.
233 request_permissions.clear(); 234 request_permissions.clear();
234 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission = 235 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
235 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER; 236 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
236 content_settings->OnMediaStreamPermissionSet(security_origin, 237 content_settings->OnMediaStreamPermissionSet(security_origin,
237 request_permissions); 238 request_permissions);
238 ASSERT_FALSE(content_settings->IsContentAllowed( 239 ASSERT_FALSE(content_settings->IsContentAllowed(
239 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 240 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
240 ASSERT_TRUE(content_settings->IsContentBlocked( 241 ASSERT_TRUE(content_settings->IsContentBlocked(
241 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 242 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
242 ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED, 243 ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED,
243 content_settings->GetMicrophoneCameraState()); 244 content_settings->GetMicrophoneCameraState());
244 245
245 // Request and block camera access. 246 // Request and block camera access.
246 request_permissions.clear(); 247 request_permissions.clear();
247 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission = 248 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
248 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER; 249 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
249 content_settings->OnMediaStreamPermissionSet(security_origin, 250 content_settings->OnMediaStreamPermissionSet(security_origin,
250 request_permissions); 251 request_permissions);
251 ASSERT_FALSE(content_settings->IsContentAllowed( 252 ASSERT_FALSE(content_settings->IsContentAllowed(
252 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 253 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
253 ASSERT_TRUE(content_settings->IsContentBlocked( 254 ASSERT_TRUE(content_settings->IsContentBlocked(
254 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 255 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
255 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED, 256 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_BLOCKED |
257 TabSpecificContentSettings::CAMERA_BLOCKED,
256 content_settings->GetMicrophoneCameraState()); 258 content_settings->GetMicrophoneCameraState());
257 259
258 // Request and allow microphone and camera access. 260 // Request and allow microphone and camera access.
259 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission = 261 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
260 MediaStreamDevicesController::MEDIA_ALLOWED; 262 MediaStreamDevicesController::MEDIA_ALLOWED;
261 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission = 263 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
262 MediaStreamDevicesController::MEDIA_ALLOWED; 264 MediaStreamDevicesController::MEDIA_ALLOWED;
263 content_settings->OnMediaStreamPermissionSet(security_origin, 265 content_settings->OnMediaStreamPermissionSet(security_origin,
264 request_permissions); 266 request_permissions);
265 ASSERT_TRUE(content_settings->IsContentAllowed( 267 ASSERT_TRUE(content_settings->IsContentAllowed(
266 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 268 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
267 ASSERT_FALSE(content_settings->IsContentBlocked( 269 ASSERT_FALSE(content_settings->IsContentBlocked(
268 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 270 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
269 ASSERT_TRUE(content_settings->IsContentAllowed( 271 ASSERT_TRUE(content_settings->IsContentAllowed(
270 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 272 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
271 ASSERT_FALSE(content_settings->IsContentBlocked( 273 ASSERT_FALSE(content_settings->IsContentBlocked(
272 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 274 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
273 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED, 275 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
276 TabSpecificContentSettings::CAMERA_ACCESSED,
274 content_settings->GetMicrophoneCameraState()); 277 content_settings->GetMicrophoneCameraState());
275 278
276 // Request and block microphone and camera access. 279 // Request and block microphone and camera access.
277 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission = 280 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
278 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER; 281 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
279 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission = 282 request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
280 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER; 283 MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
281 content_settings->OnMediaStreamPermissionSet(security_origin, 284 content_settings->OnMediaStreamPermissionSet(security_origin,
282 request_permissions); 285 request_permissions);
283 ASSERT_FALSE(content_settings->IsContentAllowed( 286 ASSERT_FALSE(content_settings->IsContentAllowed(
284 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 287 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
285 ASSERT_TRUE(content_settings->IsContentBlocked( 288 ASSERT_TRUE(content_settings->IsContentBlocked(
286 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 289 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
287 ASSERT_FALSE(content_settings->IsContentAllowed( 290 ASSERT_FALSE(content_settings->IsContentAllowed(
288 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 291 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
289 ASSERT_TRUE(content_settings->IsContentBlocked( 292 ASSERT_TRUE(content_settings->IsContentBlocked(
290 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 293 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
291 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED, 294 ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
295 TabSpecificContentSettings::MICROPHONE_BLOCKED |
296 TabSpecificContentSettings::CAMERA_ACCESSED |
297 TabSpecificContentSettings::CAMERA_BLOCKED,
292 content_settings->GetMicrophoneCameraState()); 298 content_settings->GetMicrophoneCameraState());
293 299
294 // Request microphone and camera access. Allow microphone, block camera. 300 // Request microphone and camera access. Allow microphone, block camera.
295 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission = 301 request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
296 MediaStreamDevicesController::MEDIA_ALLOWED; 302 MediaStreamDevicesController::MEDIA_ALLOWED;
297 content_settings->OnMediaStreamPermissionSet(security_origin, 303 content_settings->OnMediaStreamPermissionSet(security_origin,
298 request_permissions); 304 request_permissions);
299 ASSERT_TRUE(content_settings->IsContentAllowed( 305 ASSERT_TRUE(content_settings->IsContentAllowed(
300 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 306 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
301 ASSERT_FALSE(content_settings->IsContentBlocked( 307 ASSERT_FALSE(content_settings->IsContentBlocked(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 base::UTF8ToUTF16("text"), 379 base::UTF8ToUTF16("text"),
374 blocked_by_policy); 380 blocked_by_policy);
375 content_settings->OnLocalStorageAccessed(GURL("http://google.com"), 381 content_settings->OnLocalStorageAccessed(GURL("http://google.com"),
376 true, 382 true,
377 blocked_by_policy); 383 blocked_by_policy);
378 content_settings->OnWebDatabaseAccessed(GURL("http://google.com"), 384 content_settings->OnWebDatabaseAccessed(GURL("http://google.com"),
379 base::UTF8ToUTF16("name"), 385 base::UTF8ToUTF16("name"),
380 base::UTF8ToUTF16("display_name"), 386 base::UTF8ToUTF16("display_name"),
381 blocked_by_policy); 387 blocked_by_policy);
382 } 388 }
OLDNEW
« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698