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

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

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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/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"
(...skipping 19 matching lines...) Expand all
30 30
31 31
32 // MediaStreamInfoBarTest ----------------------------------------------------- 32 // MediaStreamInfoBarTest -----------------------------------------------------
33 33
34 class MediaStreamInfoBarTest : public WebRtcTestBase { 34 class MediaStreamInfoBarTest : public WebRtcTestBase {
35 public: 35 public:
36 MediaStreamInfoBarTest() {} 36 MediaStreamInfoBarTest() {}
37 virtual ~MediaStreamInfoBarTest() {} 37 virtual ~MediaStreamInfoBarTest() {}
38 38
39 // InProcessBrowserTest: 39 // InProcessBrowserTest:
40 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 40 virtual void SetUpCommandLine(CommandLine* command_line) override {
41 // This test expects to run with fake devices but real UI. 41 // This test expects to run with fake devices but real UI.
42 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 42 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
43 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) 43 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream))
44 << "Since this test tests the UI we want the real UI!"; 44 << "Since this test tests the UI we want the real UI!";
45 } 45 }
46 46
47 protected: 47 protected:
48 content::WebContents* LoadTestPageInTab() { 48 content::WebContents* LoadTestPageInTab() {
49 return LoadTestPageInBrowser(browser()); 49 return LoadTestPageInBrowser(browser());
50 } 50 }
(...skipping 154 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/media/cast_transport_host_filter.h ('k') | chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698