| 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" | 11 #include "chrome/browser/infobars/infobar.h" |
| 12 #include "chrome/browser/infobars/infobar_manager.h" | 12 #include "chrome/browser/infobars/infobar_manager.h" |
| 13 #include "chrome/browser/infobars/infobar_service.h" | 13 #include "chrome/browser/infobars/infobar_service.h" |
| 14 #include "chrome/browser/media/webrtc_browsertest_base.h" | 14 #include "chrome/browser/media/webrtc_browsertest_base.h" |
| 15 #include "chrome/browser/media/webrtc_browsertest_common.h" | 15 #include "chrome/browser/media/webrtc_browsertest_common.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/browser_tabstrip.h" | 18 #include "chrome/browser/ui/browser_tabstrip.h" |
| 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/content_settings_types.h" | 21 #include "chrome/common/content_settings_types.h" |
| 22 #include "chrome/test/base/in_process_browser_test.h" | 22 #include "chrome/test/base/in_process_browser_test.h" |
| 23 #include "chrome/test/base/test_switches.h" | 23 #include "chrome/test/base/test_switches.h" |
| 24 #include "chrome/test/base/ui_test_utils.h" | 24 #include "chrome/test/base/ui_test_utils.h" |
| 25 #include "chrome/test/ui/ui_test.h" | |
| 26 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" |
| 27 #include "content/public/test/browser_test_utils.h" | 26 #include "content/public/test/browser_test_utils.h" |
| 28 #include "net/test/spawned_test_server/spawned_test_server.h" | 27 #include "net/test/spawned_test_server/spawned_test_server.h" |
| 29 | 28 |
| 30 | 29 |
| 31 // MediaStreamInfoBarTest ----------------------------------------------------- | 30 // MediaStreamInfoBarTest ----------------------------------------------------- |
| 32 | 31 |
| 33 class MediaStreamInfoBarTest : public WebRtcTestBase { | 32 class MediaStreamInfoBarTest : public WebRtcTestBase { |
| 34 public: | 33 public: |
| 35 MediaStreamInfoBarTest() {} | 34 MediaStreamInfoBarTest() {} |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, | 198 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, |
| 200 MAYBE_DenyingCameraDoesNotCauseStickyDenyForMics) { | 199 MAYBE_DenyingCameraDoesNotCauseStickyDenyForMics) { |
| 201 content::WebContents* tab_contents = LoadTestPageInTab(); | 200 content::WebContents* tab_contents = LoadTestPageInTab(); |
| 202 | 201 |
| 203 // If camera blocking also blocked mics, the second call here would hang. | 202 // If camera blocking also blocked mics, the second call here would hang. |
| 204 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents, | 203 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents, |
| 205 kVideoOnlyCallConstraints); | 204 kVideoOnlyCallConstraints); |
| 206 GetUserMediaWithSpecificConstraintsAndAccept(tab_contents, | 205 GetUserMediaWithSpecificConstraintsAndAccept(tab_contents, |
| 207 kAudioOnlyCallConstraints); | 206 kAudioOnlyCallConstraints); |
| 208 } | 207 } |
| OLD | NEW |