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

Side by Side Diff: chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 base::Unretained(this))); 702 base::Unretained(this)));
703 ASSERT_FALSE(controller.IsAskingForAudio()); 703 ASSERT_FALSE(controller.IsAskingForAudio());
704 ASSERT_FALSE(controller.IsAskingForVideo()); 704 ASSERT_FALSE(controller.IsAskingForVideo());
705 } 705 }
706 706
707 // Request and block microphone and camera access with kill switch. 707 // Request and block microphone and camera access with kill switch.
708 IN_PROC_BROWSER_TEST_F(MediaStreamDevicesControllerTest, 708 IN_PROC_BROWSER_TEST_F(MediaStreamDevicesControllerTest,
709 RequestAndKillSwitchMicCam) { 709 RequestAndKillSwitchMicCam) {
710 std::map<std::string, std::string> params; 710 std::map<std::string, std::string> params;
711 params[PermissionUtil::GetPermissionString( 711 params[PermissionUtil::GetPermissionString(
712 content::PermissionType::AUDIO_CAPTURE)] = 712 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)] =
713 PermissionContextBase::kPermissionsKillSwitchBlockedValue; 713 PermissionContextBase::kPermissionsKillSwitchBlockedValue;
714 params[PermissionUtil::GetPermissionString( 714 params[PermissionUtil::GetPermissionString(
715 content::PermissionType::VIDEO_CAPTURE)] = 715 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)] =
716 PermissionContextBase::kPermissionsKillSwitchBlockedValue; 716 PermissionContextBase::kPermissionsKillSwitchBlockedValue;
717 variations::AssociateVariationParams( 717 variations::AssociateVariationParams(
718 PermissionContextBase::kPermissionsKillSwitchFieldStudy, 718 PermissionContextBase::kPermissionsKillSwitchFieldStudy,
719 "TestGroup", params); 719 "TestGroup", params);
720 base::FieldTrialList::CreateFieldTrial( 720 base::FieldTrialList::CreateFieldTrial(
721 PermissionContextBase::kPermissionsKillSwitchFieldStudy, 721 PermissionContextBase::kPermissionsKillSwitchFieldStudy,
722 "TestGroup"); 722 "TestGroup");
723 InitWithUrl(GURL("https://www.example.com")); 723 InitWithUrl(GURL("https://www.example.com"));
724 SetDevicePolicy(DEVICE_TYPE_AUDIO, ACCESS_ALLOWED); 724 SetDevicePolicy(DEVICE_TYPE_AUDIO, ACCESS_ALLOWED);
725 SetDevicePolicy(DEVICE_TYPE_VIDEO, ACCESS_ALLOWED); 725 SetDevicePolicy(DEVICE_TYPE_VIDEO, ACCESS_ALLOWED);
726 MediaStreamDevicesController controller( 726 MediaStreamDevicesController controller(
727 GetWebContents(), CreateRequest(example_audio_id(), example_video_id()), 727 GetWebContents(), CreateRequest(example_audio_id(), example_video_id()),
728 base::Bind(&MediaStreamDevicesControllerTest::OnMediaStreamResponse, 728 base::Bind(&MediaStreamDevicesControllerTest::OnMediaStreamResponse,
729 base::Unretained(this))); 729 base::Unretained(this)));
730 730
731 EXPECT_FALSE(controller.IsAllowedForAudio()); 731 EXPECT_FALSE(controller.IsAllowedForAudio());
732 EXPECT_FALSE(controller.IsAllowedForVideo()); 732 EXPECT_FALSE(controller.IsAllowedForVideo());
733 EXPECT_FALSE(controller.IsAskingForAudio()); 733 EXPECT_FALSE(controller.IsAskingForAudio());
734 EXPECT_FALSE(controller.IsAskingForVideo()); 734 EXPECT_FALSE(controller.IsAskingForVideo());
735 } 735 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698