chrome/browser/media/chrome_media_stream_infobar_browsertest.cc - Issue 19631004: Update include paths in chrome/browser/ for base/process changes.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 19631004: Update include paths in chrome/browser/ for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge ToT Created 7 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

« no previous file with comments | « chrome/browser/mac/relauncher.cc ('k') | chrome/browser/media/chrome_webrtc_browsertest.cc » ('j') | no next file with comments »

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/file_util.h"	5 #include "base/file_util.h"

6 #include "base/path_service.h"	6 #include "base/path_service.h"

7 #include "base/process_util.h"

8 #include "base/strings/stringprintf.h"	7 #include "base/strings/stringprintf.h"

9 #include "base/test/test_timeouts.h"	8 #include "base/test/test_timeouts.h"

10 #include "base/time/time.h"	9 #include "base/time/time.h"

11 #include "chrome/browser/chrome_notification_types.h"	10 #include "chrome/browser/chrome_notification_types.h"

12 #include "chrome/browser/content_settings/host_content_settings_map.h"	11 #include "chrome/browser/content_settings/host_content_settings_map.h"

13 #include "chrome/browser/infobars/infobar.h"	12 #include "chrome/browser/infobars/infobar.h"

14 #include "chrome/browser/infobars/infobar_service.h"	13 #include "chrome/browser/infobars/infobar_service.h"

15 #include "chrome/browser/media/media_stream_infobar_delegate.h"	14 #include "chrome/browser/media/media_stream_infobar_delegate.h"

16 #include "chrome/browser/media/webrtc_browsertest_common.h"	15 #include "chrome/browser/media/webrtc_browsertest_common.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

(...skipping 245 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
263 content::WebContents* tab_contents = LoadTestPageInTab();	262 content::WebContents* tab_contents = LoadTestPageInTab();

264	263

265 // If microphone blocking also blocked a AV call, the second call here	264 // If microphone blocking also blocked a AV call, the second call here

266 // would hang. The requester should only be granted access to the cam though.	265 // would hang. The requester should only be granted access to the cam though.

267 TestDenyWithSpecificConstraints(tab_contents, kAudioOnlyCallConstraints);	266 TestDenyWithSpecificConstraints(tab_contents, kAudioOnlyCallConstraints);

268 TestAcceptOnInfobarWithSpecificConstraints(tab_contents,	267 TestAcceptOnInfobarWithSpecificConstraints(tab_contents,

269 kAudioVideoCallConstraints);	268 kAudioVideoCallConstraints);

270	269

271 // TODO(phoglund): verify the requester actually only gets video tracks.	270 // TODO(phoglund): verify the requester actually only gets video tracks.

272 }	271 }

OLD	NEW