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

Side by Side Diff: content/shell/renderer/webkit_test_runner.cc

Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell/renderer/webkit_test_runner.h" 5 #include "content/shell/renderer/webkit_test_runner.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <clocale> 8 #include <clocale>
9 #include <cmath> 9 #include <cmath>
10 10
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 } // namespace 184 } // namespace
185 185
186 WebKitTestRunner::WebKitTestRunner(RenderView* render_view) 186 WebKitTestRunner::WebKitTestRunner(RenderView* render_view)
187 : RenderViewObserver(render_view), 187 : RenderViewObserver(render_view),
188 RenderViewObserverTracker<WebKitTestRunner>(render_view), 188 RenderViewObserverTracker<WebKitTestRunner>(render_view),
189 proxy_(NULL), 189 proxy_(NULL),
190 focused_view_(NULL), 190 focused_view_(NULL),
191 is_main_window_(false), 191 is_main_window_(false),
192 focus_on_next_commit_(false) { 192 focus_on_next_commit_(false) {
193 UseMockMediaStreams(render_view);
193 } 194 }
194 195
195 WebKitTestRunner::~WebKitTestRunner() { 196 WebKitTestRunner::~WebKitTestRunner() {
196 } 197 }
197 198
198 // WebTestDelegate ----------------------------------------------------------- 199 // WebTestDelegate -----------------------------------------------------------
199 200
200 void WebKitTestRunner::clearEditCommand() { 201 void WebKitTestRunner::clearEditCommand() {
201 render_view()->ClearEditCommands(); 202 render_view()->ClearEditCommands();
202 } 203 }
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 ->loadRequest(WebURLRequest(GURL("about:blank"))); 665 ->loadRequest(WebURLRequest(GURL("about:blank")));
665 Send(new ShellViewHostMsg_ResetDone(routing_id())); 666 Send(new ShellViewHostMsg_ResetDone(routing_id()));
666 } 667 }
667 668
668 void WebKitTestRunner::OnNotifyDone() { 669 void WebKitTestRunner::OnNotifyDone() {
669 render_view()->GetWebView()->mainFrame()->executeScript( 670 render_view()->GetWebView()->mainFrame()->executeScript(
670 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); 671 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
671 } 672 }
672 673
673 } // namespace content 674 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/shell_video_frame_provider.cc ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698