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

Side by Side Diff: chrome/browser/media/chrome_media_stream_infobar_browsertest.cc

Issue 410993002: Componentize content_settings_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed empty DEPS Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
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_service.h" 11 #include "chrome/browser/infobars/infobar_service.h"
12 #include "chrome/browser/media/media_stream_devices_controller.h" 12 #include "chrome/browser/media/media_stream_devices_controller.h"
13 #include "chrome/browser/media/webrtc_browsertest_base.h" 13 #include "chrome/browser/media/webrtc_browsertest_base.h"
14 #include "chrome/browser/media/webrtc_browsertest_common.h" 14 #include "chrome/browser/media/webrtc_browsertest_common.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_tabstrip.h" 17 #include "chrome/browser/ui/browser_tabstrip.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #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/content_settings/core/common/content_settings_types.h"
24 #include "components/infobars/core/infobar.h" 24 #include "components/infobars/core/infobar.h"
25 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
26 #include "content/public/common/media_stream_request.h" 26 #include "content/public/common/media_stream_request.h"
27 #include "content/public/test/browser_test_utils.h" 27 #include "content/public/test/browser_test_utils.h"
28 #include "media/base/media_switches.h" 28 #include "media/base/media_switches.h"
29 #include "net/test/spawned_test_server/spawned_test_server.h" 29 #include "net/test/spawned_test_server/spawned_test_server.h"
30 30
31 31
32 // MediaStreamInfoBarTest ----------------------------------------------------- 32 // MediaStreamInfoBarTest -----------------------------------------------------
33 33
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, 205 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
206 DenyingCameraDoesNotCauseStickyDenyForMics) { 206 DenyingCameraDoesNotCauseStickyDenyForMics) {
207 content::WebContents* tab_contents = LoadTestPageInTab(); 207 content::WebContents* tab_contents = LoadTestPageInTab();
208 208
209 // If camera blocking also blocked mics, the second call here would hang. 209 // If camera blocking also blocked mics, the second call here would hang.
210 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents, 210 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
211 kVideoOnlyCallConstraints); 211 kVideoOnlyCallConstraints);
212 GetUserMediaWithSpecificConstraintsAndAccept(tab_contents, 212 GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
213 kAudioOnlyCallConstraints); 213 kAudioOnlyCallConstraints);
214 } 214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698