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

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

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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 // Assume this is set by the content test launcher. 155 // Assume this is set by the content test launcher.
156 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 156 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
157 switches::kUseFakeUIForMediaStream)); 157 switches::kUseFakeUIForMediaStream));
158 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 158 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
159 switches::kUseFakeDeviceForMediaStream)); 159 switches::kUseFakeDeviceForMediaStream));
160 } 160 }
161 161
162 protected: 162 protected:
163 bool ExecuteJavascript(const string& javascript) { 163 bool ExecuteJavascript(const string& javascript) {
164 return ExecuteScript(shell()->web_contents(), javascript); 164 return ExecuteScript(shell()->web_contents(), javascript);
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 ASSERT_TRUE(ExecuteScriptAndExtractInt( 873 ASSERT_TRUE(ExecuteScriptAndExtractInt(
874 shell()->web_contents(), 874 shell()->web_contents(),
875 "window.domAutomationController.send(" 875 "window.domAutomationController.send("
876 " peerConnectionDataStore['" + pc.getIdString() + "']" + 876 " peerConnectionDataStore['" + pc.getIdString() + "']" +
877 " .getDataSeries('" + data_series_id + "').getCount())", 877 " .getDataSeries('" + data_series_id + "').getCount())",
878 &count)); 878 &count));
879 EXPECT_EQ(3, count); 879 EXPECT_EQ(3, count);
880 } 880 }
881 881
882 } // namespace content 882 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/manifest/manifest_manager_host.h ('k') | content/browser/message_port_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698