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

Unified Diff: content/test/layouttest_support.cc

Issue 264773002: Start moving WebUserMediaClient on the chromium side to be per frame instead of view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/renderer/webkit_test_runner.cc ('k') | content/test/test_media_stream_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/layouttest_support.cc
===================================================================
--- content/test/layouttest_support.cc (revision 267930)
+++ content/test/layouttest_support.cc (working copy)
@@ -11,6 +11,7 @@
#include "content/public/common/page_state.h"
#include "content/renderer/history_entry.h"
#include "content/renderer/history_serialization.h"
+#include "content/renderer/render_frame_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/render_view_impl.h"
#include "content/renderer/renderer_webkitplatformsupport_impl.h"
@@ -65,6 +66,8 @@
FrameProxy* render_frame_proxy = new FrameProxy(render_view, routing_id);
render_frame_proxy->setBaseProxy(GetWebTestProxyBase(render_view));
+ UseMockMediaStreams(render_frame_proxy);
+
return render_frame_proxy;
}
@@ -160,10 +163,11 @@
DisableAutoResizeForTesting(new_size);
}
-void UseMockMediaStreams(RenderView* render_view) {
- RenderViewImpl* render_view_impl = static_cast<RenderViewImpl*>(render_view);
- render_view_impl->SetMediaStreamClientForTesting(
- new TestMediaStreamClient(render_view_impl));
+void UseMockMediaStreams(RenderFrame* render_frame) {
+ RenderFrameImpl* render_frame_impl = static_cast<RenderFrameImpl*>(
+ render_frame);
+ render_frame_impl->SetMediaStreamClientForTesting(
+ new TestMediaStreamClient(render_frame_impl));
}
struct ToLower {
« no previous file with comments | « content/shell/renderer/webkit_test_runner.cc ('k') | content/test/test_media_stream_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698