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" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
14 #include "base/files/scoped_temp_dir.h" | 14 #include "base/files/scoped_temp_dir.h" |
15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
18 #include "base/string16.h" | 18 #include "base/string16.h" |
19 #include "base/stringprintf.h" | 19 #include "base/stringprintf.h" |
20 #include "base/test/test_file_util.h" | 20 #include "base/test/test_file_util.h" |
21 #include "base/utf_string_conversions.h" | 21 #include "base/utf_string_conversions.h" |
22 #include "base/values.h" | 22 #include "base/values.h" |
23 #include "chrome/app/chrome_command_ids.h" | 23 #include "chrome/app/chrome_command_ids.h" |
24 #include "chrome/browser/api/infobars/infobar_service.h" | 24 #include "chrome/browser/api/infobars/infobar_service.h" |
25 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 25 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
26 #include "chrome/browser/browser_process.h" | 26 #include "chrome/browser/browser_process.h" |
| 27 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
27 #include "chrome/browser/devtools/devtools_window.h" | 28 #include "chrome/browser/devtools/devtools_window.h" |
28 #include "chrome/browser/download/download_prefs.h" | 29 #include "chrome/browser/download/download_prefs.h" |
29 #include "chrome/browser/extensions/crx_installer.h" | 30 #include "chrome/browser/extensions/crx_installer.h" |
30 #include "chrome/browser/extensions/extension_service.h" | 31 #include "chrome/browser/extensions/extension_service.h" |
31 #include "chrome/browser/extensions/extension_system.h" | 32 #include "chrome/browser/extensions/extension_system.h" |
32 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 33 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
33 #include "chrome/browser/media/media_internals.h" | 34 #include "chrome/browser/media/media_internals.h" |
34 #include "chrome/browser/media/media_stream_devices_controller.h" | 35 #include "chrome/browser/media/media_stream_devices_controller.h" |
35 #include "chrome/browser/net/url_request_mock_util.h" | 36 #include "chrome/browser/net/url_request_mock_util.h" |
36 #include "chrome/browser/plugins/plugin_prefs.h" | 37 #include "chrome/browser/plugins/plugin_prefs.h" |
(...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1773 } else { | 1774 } else { |
1774 ASSERT_EQ(0U, devices.size()); | 1775 ASSERT_EQ(0U, devices.size()); |
1775 } | 1776 } |
1776 } | 1777 } |
1777 | 1778 |
1778 void FinishAudioTest() { | 1779 void FinishAudioTest() { |
1779 content::MediaStreamRequest request(0, 0, GURL(), | 1780 content::MediaStreamRequest request(0, 0, GURL(), |
1780 content::MEDIA_OPEN_DEVICE, "fake_dev", | 1781 content::MEDIA_OPEN_DEVICE, "fake_dev", |
1781 content::MEDIA_DEVICE_AUDIO_CAPTURE, | 1782 content::MEDIA_DEVICE_AUDIO_CAPTURE, |
1782 content::MEDIA_NO_SERVICE); | 1783 content::MEDIA_NO_SERVICE); |
| 1784 TabSpecificContentSettings* content_settings = |
| 1785 TabSpecificContentSettings::FromWebContents( |
| 1786 chrome::GetActiveWebContents(browser())); |
1783 MediaStreamDevicesController controller( | 1787 MediaStreamDevicesController controller( |
1784 browser()->profile(), request, | 1788 browser()->profile(), |
| 1789 content_settings, |
| 1790 request, |
1785 base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this)); | 1791 base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this)); |
1786 controller.DismissInfoBarAndTakeActionOnSettings(); | 1792 controller.DismissInfoBarAndTakeActionOnSettings(); |
1787 | 1793 |
1788 MessageLoop::current()->QuitWhenIdle(); | 1794 MessageLoop::current()->QuitWhenIdle(); |
1789 } | 1795 } |
1790 | 1796 |
1791 void FinishVideoTest() { | 1797 void FinishVideoTest() { |
1792 content::MediaStreamRequest request(0, 0, GURL(), | 1798 content::MediaStreamRequest request(0, 0, GURL(), |
1793 content::MEDIA_OPEN_DEVICE, "fake_dev", | 1799 content::MEDIA_OPEN_DEVICE, "fake_dev", |
1794 content::MEDIA_NO_SERVICE, | 1800 content::MEDIA_NO_SERVICE, |
1795 content::MEDIA_DEVICE_VIDEO_CAPTURE); | 1801 content::MEDIA_DEVICE_VIDEO_CAPTURE); |
| 1802 TabSpecificContentSettings* content_settings = |
| 1803 TabSpecificContentSettings::FromWebContents( |
| 1804 chrome::GetActiveWebContents(browser())); |
1796 MediaStreamDevicesController controller( | 1805 MediaStreamDevicesController controller( |
1797 browser()->profile(), request, | 1806 browser()->profile(), content_settings, request, |
1798 base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this)); | 1807 base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this)); |
1799 controller.DismissInfoBarAndTakeActionOnSettings(); | 1808 controller.DismissInfoBarAndTakeActionOnSettings(); |
1800 | 1809 |
1801 MessageLoop::current()->QuitWhenIdle(); | 1810 MessageLoop::current()->QuitWhenIdle(); |
1802 } | 1811 } |
1803 | 1812 |
1804 bool policy_value_; | 1813 bool policy_value_; |
1805 }; | 1814 }; |
1806 | 1815 |
1807 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, | 1816 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1854 this)); | 1863 this)); |
1855 | 1864 |
1856 MessageLoop::current()->Run(); | 1865 MessageLoop::current()->Run(); |
1857 } | 1866 } |
1858 | 1867 |
1859 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, | 1868 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, |
1860 MediaStreamDevicesControllerBrowserTest, | 1869 MediaStreamDevicesControllerBrowserTest, |
1861 testing::Bool()); | 1870 testing::Bool()); |
1862 | 1871 |
1863 } // namespace policy | 1872 } // namespace policy |
OLD | NEW |