OLD | NEW |
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 <algorithm> | 5 #include <algorithm> |
6 #include <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/download/download_prefs.h" | 35 #include "chrome/browser/download/download_prefs.h" |
36 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" | 36 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" |
37 #include "chrome/browser/extensions/crx_installer.h" | 37 #include "chrome/browser/extensions/crx_installer.h" |
38 #include "chrome/browser/extensions/extension_host.h" | 38 #include "chrome/browser/extensions/extension_host.h" |
39 #include "chrome/browser/extensions/extension_service.h" | 39 #include "chrome/browser/extensions/extension_service.h" |
40 #include "chrome/browser/extensions/unpacked_installer.h" | 40 #include "chrome/browser/extensions/unpacked_installer.h" |
41 #include "chrome/browser/extensions/updater/extension_cache_fake.h" | 41 #include "chrome/browser/extensions/updater/extension_cache_fake.h" |
42 #include "chrome/browser/extensions/updater/extension_updater.h" | 42 #include "chrome/browser/extensions/updater/extension_updater.h" |
43 #include "chrome/browser/infobars/infobar.h" | 43 #include "chrome/browser/infobars/infobar.h" |
44 #include "chrome/browser/infobars/infobar_service.h" | 44 #include "chrome/browser/infobars/infobar_service.h" |
45 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | |
46 #include "chrome/browser/media/media_stream_devices_controller.h" | 45 #include "chrome/browser/media/media_stream_devices_controller.h" |
47 #include "chrome/browser/metrics/variations/variations_service.h" | 46 #include "chrome/browser/metrics/variations/variations_service.h" |
48 #include "chrome/browser/net/url_request_mock_util.h" | 47 #include "chrome/browser/net/url_request_mock_util.h" |
49 #include "chrome/browser/plugins/plugin_prefs.h" | 48 #include "chrome/browser/plugins/plugin_prefs.h" |
50 #include "chrome/browser/policy/cloud/test_request_interceptor.h" | 49 #include "chrome/browser/policy/cloud/test_request_interceptor.h" |
51 #include "chrome/browser/policy/profile_policy_connector.h" | 50 #include "chrome/browser/policy/profile_policy_connector.h" |
52 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 51 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
53 #include "chrome/browser/prefs/session_startup_pref.h" | 52 #include "chrome/browser/prefs/session_startup_pref.h" |
54 #include "chrome/browser/profiles/profile.h" | 53 #include "chrome/browser/profiles/profile.h" |
55 #include "chrome/browser/search/instant_service.h" | 54 #include "chrome/browser/search/instant_service.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 #include "components/policy/core/common/policy_pref_names.h" | 88 #include "components/policy/core/common/policy_pref_names.h" |
90 #include "components/policy/core/common/policy_service.h" | 89 #include "components/policy/core/common/policy_service.h" |
91 #include "components/policy/core/common/policy_service_impl.h" | 90 #include "components/policy/core/common/policy_service_impl.h" |
92 #include "content/public/browser/browser_child_process_host_iterator.h" | 91 #include "content/public/browser/browser_child_process_host_iterator.h" |
93 #include "content/public/browser/browser_context.h" | 92 #include "content/public/browser/browser_context.h" |
94 #include "content/public/browser/browser_thread.h" | 93 #include "content/public/browser/browser_thread.h" |
95 #include "content/public/browser/child_process_data.h" | 94 #include "content/public/browser/child_process_data.h" |
96 #include "content/public/browser/download_item.h" | 95 #include "content/public/browser/download_item.h" |
97 #include "content/public/browser/download_manager.h" | 96 #include "content/public/browser/download_manager.h" |
98 #include "content/public/browser/gpu_data_manager.h" | 97 #include "content/public/browser/gpu_data_manager.h" |
| 98 #include "content/public/browser/media_capture_devices.h" |
99 #include "content/public/browser/notification_details.h" | 99 #include "content/public/browser/notification_details.h" |
100 #include "content/public/browser/notification_observer.h" | 100 #include "content/public/browser/notification_observer.h" |
101 #include "content/public/browser/notification_registrar.h" | 101 #include "content/public/browser/notification_registrar.h" |
102 #include "content/public/browser/notification_service.h" | 102 #include "content/public/browser/notification_service.h" |
103 #include "content/public/browser/notification_source.h" | 103 #include "content/public/browser/notification_source.h" |
104 #include "content/public/browser/notification_types.h" | 104 #include "content/public/browser/notification_types.h" |
105 #include "content/public/browser/plugin_service.h" | 105 #include "content/public/browser/plugin_service.h" |
106 #include "content/public/browser/render_process_host.h" | 106 #include "content/public/browser/render_process_host.h" |
107 #include "content/public/browser/render_view_host.h" | 107 #include "content/public/browser/render_view_host.h" |
108 #include "content/public/browser/web_contents.h" | 108 #include "content/public/browser/web_contents.h" |
(...skipping 2660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2769 content::MediaStreamDevice fake_audio_device( | 2769 content::MediaStreamDevice fake_audio_device( |
2770 content::MEDIA_DEVICE_AUDIO_CAPTURE, "fake_dev", "Fake Audio Device"); | 2770 content::MEDIA_DEVICE_AUDIO_CAPTURE, "fake_dev", "Fake Audio Device"); |
2771 audio_devices.push_back(fake_audio_device); | 2771 audio_devices.push_back(fake_audio_device); |
2772 | 2772 |
2773 PolicyMap policies; | 2773 PolicyMap policies; |
2774 ConfigurePolicyMap(&policies, key::kAudioCaptureAllowed, NULL, NULL); | 2774 ConfigurePolicyMap(&policies, key::kAudioCaptureAllowed, NULL, NULL); |
2775 UpdateProviderPolicy(policies); | 2775 UpdateProviderPolicy(policies); |
2776 | 2776 |
2777 content::BrowserThread::PostTaskAndReply( | 2777 content::BrowserThread::PostTaskAndReply( |
2778 content::BrowserThread::IO, FROM_HERE, | 2778 content::BrowserThread::IO, FROM_HERE, |
2779 base::Bind(&MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged, | 2779 base::Bind(&content::MediaCaptureDevices::SetAudioCaptureDevices, |
2780 base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()), | 2780 base::Unretained(content::MediaCaptureDevices::GetInstance()), |
2781 audio_devices), | 2781 audio_devices), |
2782 base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishAudioTest, | 2782 base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishAudioTest, |
2783 this)); | 2783 this)); |
2784 | 2784 |
2785 base::MessageLoop::current()->Run(); | 2785 base::MessageLoop::current()->Run(); |
2786 } | 2786 } |
2787 | 2787 |
2788 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, | 2788 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, |
2789 AudioCaptureAllowedUrls) { | 2789 AudioCaptureAllowedUrls) { |
2790 content::MediaStreamDevices audio_devices; | 2790 content::MediaStreamDevices audio_devices; |
(...skipping 11 matching lines...) Expand all Loading... |
2802 | 2802 |
2803 for (size_t i = 0; i < arraysize(allow_pattern); ++i) { | 2803 for (size_t i = 0; i < arraysize(allow_pattern); ++i) { |
2804 PolicyMap policies; | 2804 PolicyMap policies; |
2805 ConfigurePolicyMap(&policies, key::kAudioCaptureAllowed, | 2805 ConfigurePolicyMap(&policies, key::kAudioCaptureAllowed, |
2806 key::kAudioCaptureAllowedUrls, allow_pattern[i]); | 2806 key::kAudioCaptureAllowedUrls, allow_pattern[i]); |
2807 UpdateProviderPolicy(policies); | 2807 UpdateProviderPolicy(policies); |
2808 | 2808 |
2809 content::BrowserThread::PostTaskAndReply( | 2809 content::BrowserThread::PostTaskAndReply( |
2810 content::BrowserThread::IO, FROM_HERE, | 2810 content::BrowserThread::IO, FROM_HERE, |
2811 base::Bind( | 2811 base::Bind( |
2812 &MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged, | 2812 &content::MediaCaptureDevices::SetAudioCaptureDevices, |
2813 base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()), | 2813 base::Unretained(content::MediaCaptureDevices::GetInstance()), |
2814 audio_devices), | 2814 audio_devices), |
2815 base::Bind( | 2815 base::Bind( |
2816 &MediaStreamDevicesControllerBrowserTest::FinishAudioTest, | 2816 &MediaStreamDevicesControllerBrowserTest::FinishAudioTest, |
2817 this)); | 2817 this)); |
2818 | 2818 |
2819 base::MessageLoop::current()->Run(); | 2819 base::MessageLoop::current()->Run(); |
2820 } | 2820 } |
2821 } | 2821 } |
2822 | 2822 |
2823 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, | 2823 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, |
2824 VideoCaptureAllowed) { | 2824 VideoCaptureAllowed) { |
2825 content::MediaStreamDevices video_devices; | 2825 content::MediaStreamDevices video_devices; |
2826 content::MediaStreamDevice fake_video_device( | 2826 content::MediaStreamDevice fake_video_device( |
2827 content::MEDIA_DEVICE_VIDEO_CAPTURE, "fake_dev", "Fake Video Device"); | 2827 content::MEDIA_DEVICE_VIDEO_CAPTURE, "fake_dev", "Fake Video Device"); |
2828 video_devices.push_back(fake_video_device); | 2828 video_devices.push_back(fake_video_device); |
2829 | 2829 |
2830 PolicyMap policies; | 2830 PolicyMap policies; |
2831 ConfigurePolicyMap(&policies, key::kVideoCaptureAllowed, NULL, NULL); | 2831 ConfigurePolicyMap(&policies, key::kVideoCaptureAllowed, NULL, NULL); |
2832 UpdateProviderPolicy(policies); | 2832 UpdateProviderPolicy(policies); |
2833 | 2833 |
2834 content::BrowserThread::PostTaskAndReply( | 2834 content::BrowserThread::PostTaskAndReply( |
2835 content::BrowserThread::IO, FROM_HERE, | 2835 content::BrowserThread::IO, FROM_HERE, |
2836 base::Bind(&MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged, | 2836 base::Bind(&content::MediaCaptureDevices::SetVideoCaptureDevices, |
2837 base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()), | 2837 base::Unretained(content::MediaCaptureDevices::GetInstance()), |
2838 video_devices), | 2838 video_devices), |
2839 base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest, | 2839 base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest, |
2840 this)); | 2840 this)); |
2841 | 2841 |
2842 base::MessageLoop::current()->Run(); | 2842 base::MessageLoop::current()->Run(); |
2843 } | 2843 } |
2844 | 2844 |
2845 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, | 2845 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, |
2846 VideoCaptureAllowedUrls) { | 2846 VideoCaptureAllowedUrls) { |
2847 content::MediaStreamDevices video_devices; | 2847 content::MediaStreamDevices video_devices; |
(...skipping 11 matching lines...) Expand all Loading... |
2859 | 2859 |
2860 for (size_t i = 0; i < arraysize(allow_pattern); ++i) { | 2860 for (size_t i = 0; i < arraysize(allow_pattern); ++i) { |
2861 PolicyMap policies; | 2861 PolicyMap policies; |
2862 ConfigurePolicyMap(&policies, key::kVideoCaptureAllowed, | 2862 ConfigurePolicyMap(&policies, key::kVideoCaptureAllowed, |
2863 key::kVideoCaptureAllowedUrls, allow_pattern[i]); | 2863 key::kVideoCaptureAllowedUrls, allow_pattern[i]); |
2864 UpdateProviderPolicy(policies); | 2864 UpdateProviderPolicy(policies); |
2865 | 2865 |
2866 content::BrowserThread::PostTaskAndReply( | 2866 content::BrowserThread::PostTaskAndReply( |
2867 content::BrowserThread::IO, FROM_HERE, | 2867 content::BrowserThread::IO, FROM_HERE, |
2868 base::Bind( | 2868 base::Bind( |
2869 &MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged, | 2869 &content::MediaCaptureDevices::SetVideoCaptureDevices, |
2870 base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()), | 2870 base::Unretained(content::MediaCaptureDevices::GetInstance()), |
2871 video_devices), | 2871 video_devices), |
2872 base::Bind( | 2872 base::Bind( |
2873 &MediaStreamDevicesControllerBrowserTest::FinishVideoTest, | 2873 &MediaStreamDevicesControllerBrowserTest::FinishVideoTest, |
2874 this)); | 2874 this)); |
2875 | 2875 |
2876 base::MessageLoop::current()->Run(); | 2876 base::MessageLoop::current()->Run(); |
2877 } | 2877 } |
2878 } | 2878 } |
2879 | 2879 |
2880 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, | 2880 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2958 PrefService* prefs = browser()->profile()->GetPrefs(); | 2958 PrefService* prefs = browser()->profile()->GetPrefs(); |
2959 EXPECT_TRUE(extensions::NativeMessageProcessHost::IsHostAllowed( | 2959 EXPECT_TRUE(extensions::NativeMessageProcessHost::IsHostAllowed( |
2960 prefs, "host.name")); | 2960 prefs, "host.name")); |
2961 EXPECT_FALSE(extensions::NativeMessageProcessHost::IsHostAllowed( | 2961 EXPECT_FALSE(extensions::NativeMessageProcessHost::IsHostAllowed( |
2962 prefs, "other.host.name")); | 2962 prefs, "other.host.name")); |
2963 } | 2963 } |
2964 | 2964 |
2965 #endif // !defined(CHROME_OS) | 2965 #endif // !defined(CHROME_OS) |
2966 | 2966 |
2967 } // namespace policy | 2967 } // namespace policy |
OLD | NEW |