OLD | NEW |
---|---|
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 Loading... | |
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 scoped_ptr<MediaStreamRendererFactory> factory( | |
277 new TestMediaStreamRendererFactory()); | |
278 return factory.Pass(); | |
no longer working on chromium
2014/05/27 12:30:36
ditto
perkj_chrome
2014/05/27 13:27:03
Done.
| |
279 } | |
280 | |
273 WebTestProxyBase* base_proxy_; | 281 WebTestProxyBase* base_proxy_; |
274 | 282 |
275 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 283 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
276 }; | 284 }; |
277 | 285 |
278 } // namespace content | 286 } // namespace content |
279 | 287 |
280 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 288 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
OLD | NEW |