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

Side by Side Diff: content/test/webrtc_content_browsertest_base.h

Issue 630813002: Replace OVERRIDE and FINAL with override and final in content/test/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/test/web_layer_tree_view_impl_for_testing.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/public/test/content_browser_test.h" 5 #include "content/public/test/content_browser_test.h"
6 6
7 namespace base { 7 namespace base {
8 class CommandLine; 8 class CommandLine;
9 } 9 }
10 10
11 namespace content { 11 namespace content {
12 12
13 // Contains stuff WebRTC browsertests have in common. 13 // Contains stuff WebRTC browsertests have in common.
14 class WebRtcContentBrowserTest: public ContentBrowserTest { 14 class WebRtcContentBrowserTest: public ContentBrowserTest {
15 public: 15 public:
16 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; 16 virtual void SetUpCommandLine(base::CommandLine* command_line) override;
17 virtual void SetUp() OVERRIDE; 17 virtual void SetUp() override;
18 virtual void TearDown() OVERRIDE; 18 virtual void TearDown() override;
19 19
20 protected: 20 protected:
21 // Executes |javascript|. The script is required to use 21 // Executes |javascript|. The script is required to use
22 // window.domAutomationController.send to send a string value back to here. 22 // window.domAutomationController.send to send a string value back to here.
23 std::string ExecuteJavascriptAndReturnResult( 23 std::string ExecuteJavascriptAndReturnResult(
24 const std::string& javascript); 24 const std::string& javascript);
25 25
26 // Waits for the javascript to return OK via the automation controller. 26 // Waits for the javascript to return OK via the automation controller.
27 // If the javascript returns != OK or times out, we fail the test. 27 // If the javascript returns != OK or times out, we fail the test.
28 void ExecuteJavascriptAndWaitForOk(const std::string& javascript); 28 void ExecuteJavascriptAndWaitForOk(const std::string& javascript);
29 29
30 void DisableOpusIfOnAndroid(); 30 void DisableOpusIfOnAndroid();
31 31
32 // Generates javascript code for a getUserMedia call. 32 // Generates javascript code for a getUserMedia call.
33 std::string GenerateGetUserMediaCall(const char* function_name, 33 std::string GenerateGetUserMediaCall(const char* function_name,
34 int min_width, 34 int min_width,
35 int max_width, 35 int max_width,
36 int min_height, 36 int min_height,
37 int max_height, 37 int max_height,
38 int min_frame_rate, 38 int min_frame_rate,
39 int max_frame_rate) const; 39 int max_frame_rate) const;
40 }; 40 };
41 41
42 } // namespace content 42 } // namespace content
OLDNEW
« no previous file with comments | « content/test/web_layer_tree_view_impl_for_testing.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698