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

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

Issue 906753002: Revert of Added MockPresentationClient to use in layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 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/mock_presentation_client.h"
10 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" 9 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
11 #include "content/shell/renderer/test_runner/test_interfaces.h" 10 #include "content/shell/renderer/test_runner/test_interfaces.h"
12 #include "content/shell/renderer/test_runner/test_runner.h" 11 #include "content/shell/renderer/test_runner/test_runner.h"
13 #include "content/shell/renderer/test_runner/web_test_delegate.h" 12 #include "content/shell/renderer/test_runner/web_test_delegate.h"
14 #include "content/shell/renderer/test_runner/web_test_proxy.h" 13 #include "content/shell/renderer/test_runner/web_test_proxy.h"
15 #include "content/test/test_media_stream_renderer_factory.h" 14 #include "content/test/test_media_stream_renderer_factory.h"
16 #include "third_party/WebKit/public/platform/WebString.h" 15 #include "third_party/WebKit/public/platform/WebString.h"
17 16
18 namespace content { 17 namespace content {
19 18
(...skipping 14 matching lines...) Expand all
34 blink::WebPlugin* plugin = base_proxy_->CreatePlugin(frame, params); 33 blink::WebPlugin* plugin = base_proxy_->CreatePlugin(frame, params);
35 if (plugin) 34 if (plugin)
36 return plugin; 35 return plugin;
37 return Base::createPlugin(frame, params); 36 return Base::createPlugin(frame, params);
38 } 37 }
39 38
40 virtual blink::WebScreenOrientationClient* webScreenOrientationClient() { 39 virtual blink::WebScreenOrientationClient* webScreenOrientationClient() {
41 return base_proxy_->GetScreenOrientationClientMock(); 40 return base_proxy_->GetScreenOrientationClientMock();
42 } 41 }
43 42
44 virtual blink::WebPresentationClient* presentationClient() {
45 return base_proxy_->GetPresentationClientMock();
46 }
47
48 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 43 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
49 const blink::WebString& source_name, 44 const blink::WebString& source_name,
50 unsigned source_line, 45 unsigned source_line,
51 const blink::WebString& stack_trace) { 46 const blink::WebString& stack_trace) {
52 base_proxy_->DidAddMessageToConsole(message, source_name, source_line); 47 base_proxy_->DidAddMessageToConsole(message, source_name, source_line);
53 Base::didAddMessageToConsole( 48 Base::didAddMessageToConsole(
54 message, source_name, source_line, stack_trace); 49 message, source_name, source_line, stack_trace);
55 } 50 }
56 51
57 virtual bool canCreatePluginWithoutRenderer( 52 virtual bool canCreatePluginWithoutRenderer(
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 #endif 294 #endif
300 295
301 WebTestProxyBase* base_proxy_; 296 WebTestProxyBase* base_proxy_;
302 297
303 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 298 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
304 }; 299 };
305 300
306 } // namespace content 301 } // namespace content
307 302
308 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 303 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/test_runner.cc ('k') | content/shell/renderer/test_runner/web_test_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698