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

Side by Side Diff: content/browser/media/webrtc_internals_browsertest.cc

Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/media (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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/json/json_reader.h" 6 #include "base/json/json_reader.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #define MAYBE_WebRtcInternalsBrowserTest DISABLED_WebRtcInternalsBrowserTest 144 #define MAYBE_WebRtcInternalsBrowserTest DISABLED_WebRtcInternalsBrowserTest
145 #else 145 #else
146 #define MAYBE_WebRtcInternalsBrowserTest WebRtcInternalsBrowserTest 146 #define MAYBE_WebRtcInternalsBrowserTest WebRtcInternalsBrowserTest
147 #endif 147 #endif
148 148
149 class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest { 149 class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest {
150 public: 150 public:
151 MAYBE_WebRtcInternalsBrowserTest() {} 151 MAYBE_WebRtcInternalsBrowserTest() {}
152 virtual ~MAYBE_WebRtcInternalsBrowserTest() {} 152 virtual ~MAYBE_WebRtcInternalsBrowserTest() {}
153 153
154 virtual void SetUpOnMainThread() OVERRIDE { 154 virtual void SetUpOnMainThread() override {
155 // We need fake devices in this test since we want to run on naked VMs. We 155 // We need fake devices in this test since we want to run on naked VMs. We
156 // assume these switches are set by default in content_browsertests. 156 // assume these switches are set by default in content_browsertests.
157 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 157 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
158 switches::kUseFakeDeviceForMediaStream)); 158 switches::kUseFakeDeviceForMediaStream));
159 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 159 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
160 switches::kUseFakeUIForMediaStream)); 160 switches::kUseFakeUIForMediaStream));
161 } 161 }
162 162
163 protected: 163 protected:
164 bool ExecuteJavascript(const string& javascript) { 164 bool ExecuteJavascript(const string& javascript) {
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 ASSERT_TRUE(ExecuteScriptAndExtractInt( 874 ASSERT_TRUE(ExecuteScriptAndExtractInt(
875 shell()->web_contents(), 875 shell()->web_contents(),
876 "window.domAutomationController.send(" 876 "window.domAutomationController.send("
877 " peerConnectionDataStore['" + pc.getIdString() + "']" + 877 " peerConnectionDataStore['" + pc.getIdString() + "']" +
878 " .getDataSeries('" + data_series_id + "').getCount())", 878 " .getDataSeries('" + data_series_id + "').getCount())",
879 &count)); 879 &count));
880 EXPECT_EQ(3, count); 880 EXPECT_EQ(3, count);
881 } 881 }
882 882
883 } // namespace content 883 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_internals.h ('k') | content/browser/media/webrtc_internals_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698