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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 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 | 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/files/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"
(...skipping 188 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
« no previous file with comments | « chrome/browser/mac/relauncher.cc ('k') | chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698