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

Side by Side Diff: chrome/browser/media/chrome_webrtc_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/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "chrome/browser/media/webrtc_browsertest_base.h" 7 #include "chrome/browser/media/webrtc_browsertest_base.h"
8 #include "chrome/browser/media/webrtc_browsertest_common.h" 8 #include "chrome/browser/media/webrtc_browsertest_common.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_tabstrip.h" 10 #include "chrome/browser/ui/browser_tabstrip.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
15 #include "content/public/test/browser_test_utils.h" 15 #include "content/public/test/browser_test_utils.h"
16 #include "media/base/media_switches.h" 16 #include "media/base/media_switches.h"
17 #include "net/test/embedded_test_server/embedded_test_server.h" 17 #include "net/test/embedded_test_server/embedded_test_server.h"
18 18
19 static const char kMainWebrtcTestHtmlPage[] = 19 static const char kMainWebrtcTestHtmlPage[] =
20 "/webrtc/webrtc_jsep01_test.html"; 20 "/webrtc/webrtc_jsep01_test.html";
21 21
22 // Top-level integration test for WebRTC. It always uses fake devices; see 22 // Top-level integration test for WebRTC. It always uses fake devices; see
23 // WebRtcWebcamBrowserTest for a test that acquires any real webcam on the 23 // WebRtcWebcamBrowserTest for a test that acquires any real webcam on the
24 // system. 24 // system.
25 class WebRtcBrowserTest : public WebRtcTestBase { 25 class WebRtcBrowserTest : public WebRtcTestBase {
26 public: 26 public:
27 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 27 virtual void SetUpInProcessBrowserTestFixture() override {
28 DetectErrorsInJavaScript(); // Look for errors in our rather complex js. 28 DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
29 } 29 }
30 30
31 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 31 virtual void SetUpCommandLine(CommandLine* command_line) override {
32 // Ensure the infobar is enabled, since we expect that in this test. 32 // Ensure the infobar is enabled, since we expect that in this test.
33 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); 33 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
34 34
35 // Always use fake devices. 35 // Always use fake devices.
36 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 36 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
37 37
38 // Flag used by TestWebAudioMediaStream to force garbage collection. 38 // Flag used by TestWebAudioMediaStream to force garbage collection.
39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); 39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
40 } 40 }
41 }; 41 };
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); 75 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html"));
76 ui_test_utils::NavigateToURL(browser(), url); 76 ui_test_utils::NavigateToURL(browser(), url);
77 content::WebContents* tab = 77 content::WebContents* tab =
78 browser()->tab_strip_model()->GetActiveWebContents(); 78 browser()->tab_strip_model()->GetActiveWebContents();
79 79
80 // A sleep is necessary to be able to detect the crash. 80 // A sleep is necessary to be able to detect the crash.
81 test::SleepInJavascript(tab, 1000); 81 test::SleepInJavascript(tab, 1000);
82 82
83 ASSERT_FALSE(tab->IsCrashed()); 83 ASSERT_FALSE(tab->IsCrashed());
84 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698