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

Side by Side Diff: chrome/browser/media/webrtc/media_stream_infobar_browsertest.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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
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/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/macros.h" 7 #include "base/macros.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_factory.h" 10 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
11 #include "chrome/browser/media/media_stream_devices_controller.h" 11 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
12 #include "chrome/browser/media/webrtc_browsertest_base.h" 12 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h"
13 #include "chrome/browser/media/webrtc_browsertest_common.h" 13 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_tabstrip.h" 16 #include "chrome/browser/ui/browser_tabstrip.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/test/base/in_process_browser_test.h" 19 #include "chrome/test/base/in_process_browser_test.h"
20 #include "chrome/test/base/test_switches.h" 20 #include "chrome/test/base/test_switches.h"
21 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
22 #include "components/content_settings/core/browser/host_content_settings_map.h" 22 #include "components/content_settings/core/browser/host_content_settings_map.h"
23 #include "components/content_settings/core/common/content_settings_types.h" 23 #include "components/content_settings/core/common/content_settings_types.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, 160 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
161 DenyingCameraDoesNotCauseStickyDenyForMics) { 161 DenyingCameraDoesNotCauseStickyDenyForMics) {
162 content::WebContents* tab_contents = LoadTestPageInTab(); 162 content::WebContents* tab_contents = LoadTestPageInTab();
163 163
164 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents, 164 GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
165 kVideoOnlyCallConstraints); 165 kVideoOnlyCallConstraints);
166 EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept( 166 EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
167 tab_contents, kAudioOnlyCallConstraints)); 167 tab_contents, kAudioOnlyCallConstraints));
168 } 168 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698