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

Side by Side Diff: content/shell/renderer/test_runner/web_frame_test_proxy.h

Issue 294043015: Move creation of MediaStream renders from MediaStreamImpl to MediaStreamRenderFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed commments. Fixed build when enable_webrtc = 0 Created 6 years, 7 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/test/layouttest_support.cc » ('j') | 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 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/TestInterfaces.h" 9 #include "content/shell/renderer/test_runner/TestInterfaces.h"
10 #include "content/shell/renderer/test_runner/WebTestDelegate.h" 10 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
11 #include "content/shell/renderer/test_runner/test_runner.h" 11 #include "content/shell/renderer/test_runner/test_runner.h"
12 #include "content/shell/renderer/test_runner/web_test_proxy.h" 12 #include "content/shell/renderer/test_runner/web_test_proxy.h"
13 #include "content/test/test_media_stream_renderer_factory.h"
13 #include "third_party/WebKit/public/platform/WebString.h" 14 #include "third_party/WebKit/public/platform/WebString.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 // Templetized wrapper around RenderFrameImpl objects, which implement 18 // Templetized wrapper around RenderFrameImpl objects, which implement
18 // the WebFrameClient interface. 19 // the WebFrameClient interface.
19 template <class Base, typename P, typename R> 20 template <class Base, typename P, typename R>
20 class WebFrameTestProxy : public Base { 21 class WebFrameTestProxy : public Base {
21 public: 22 public:
22 WebFrameTestProxy(P p, R r) : Base(p, r), base_proxy_(NULL) {} 23 WebFrameTestProxy(P p, R r) : Base(p, r), base_proxy_(NULL) {}
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, 264 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
264 target, event); 265 target, event);
265 } 266 }
266 267
267 virtual void didStopLoading() { 268 virtual void didStopLoading() {
268 base_proxy_->DidStopLoading(); 269 base_proxy_->DidStopLoading();
269 Base::didStopLoading(); 270 Base::didStopLoading();
270 } 271 }
271 272
272 private: 273 private:
274 virtual scoped_ptr<MediaStreamRendererFactory>
275 CreateRendererFactory() OVERRIDE {
276 return scoped_ptr<MediaStreamRendererFactory>(
277 new TestMediaStreamRendererFactory());
278 }
279
273 WebTestProxyBase* base_proxy_; 280 WebTestProxyBase* base_proxy_;
274 281
275 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 282 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
276 }; 283 };
277 284
278 } // namespace content 285 } // namespace content
279 286
280 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 287 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698