OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/content_settings/host_content_settings_map.h" | 10 #include "chrome/browser/content_settings/host_content_settings_map.h" |
11 #include "chrome/browser/infobars/infobar.h" | |
12 #include "chrome/browser/infobars/infobar_service.h" | 11 #include "chrome/browser/infobars/infobar_service.h" |
13 #include "chrome/browser/media/webrtc_browsertest_base.h" | 12 #include "chrome/browser/media/webrtc_browsertest_base.h" |
14 #include "chrome/browser/media/webrtc_browsertest_common.h" | 13 #include "chrome/browser/media/webrtc_browsertest_common.h" |
15 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_tabstrip.h" | 16 #include "chrome/browser/ui/browser_tabstrip.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/common/content_settings_types.h" | 19 #include "chrome/common/content_settings_types.h" |
21 #include "chrome/test/base/in_process_browser_test.h" | 20 #include "chrome/test/base/in_process_browser_test.h" |
22 #include "chrome/test/base/test_switches.h" | 21 #include "chrome/test/base/test_switches.h" |
23 #include "chrome/test/base/ui_test_utils.h" | 22 #include "chrome/test/base/ui_test_utils.h" |
| 23 #include "components/infobars/core/infobar.h" |
24 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
25 #include "content/public/test/browser_test_utils.h" | 25 #include "content/public/test/browser_test_utils.h" |
26 #include "net/test/spawned_test_server/spawned_test_server.h" | 26 #include "net/test/spawned_test_server/spawned_test_server.h" |
27 | 27 |
28 | 28 |
29 // MediaStreamInfoBarTest ----------------------------------------------------- | 29 // MediaStreamInfoBarTest ----------------------------------------------------- |
30 | 30 |
31 class MediaStreamInfoBarTest : public WebRtcTestBase { | 31 class MediaStreamInfoBarTest : public WebRtcTestBase { |
32 public: | 32 public: |
33 MediaStreamInfoBarTest() {} | 33 MediaStreamInfoBarTest() {} |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, | 197 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, |
198 MAYBE_DenyingCameraDoesNotCauseStickyDenyForMics) { | 198 MAYBE_DenyingCameraDoesNotCauseStickyDenyForMics) { |
199 content::WebContents* tab_contents = LoadTestPageInTab(); | 199 content::WebContents* tab_contents = LoadTestPageInTab(); |
200 | 200 |
201 // If camera blocking also blocked mics, the second call here would hang. | 201 // If camera blocking also blocked mics, the second call here would hang. |
202 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents, | 202 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents, |
203 kVideoOnlyCallConstraints); | 203 kVideoOnlyCallConstraints); |
204 GetUserMediaWithSpecificConstraintsAndAccept(tab_contents, | 204 GetUserMediaWithSpecificConstraintsAndAccept(tab_contents, |
205 kAudioOnlyCallConstraints); | 205 kAudioOnlyCallConstraints); |
206 } | 206 } |
OLD | NEW |