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

Side by Side Diff: content/shell/renderer/test_runner/web_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_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 struct WebPluginParams; 69 struct WebPluginParams;
70 struct WebPoint; 70 struct WebPoint;
71 struct WebSize; 71 struct WebSize;
72 struct WebWindowFeatures; 72 struct WebWindowFeatures;
73 typedef unsigned WebColor; 73 typedef unsigned WebColor;
74 } 74 }
75 75
76 namespace content { 76 namespace content {
77 77
78 class MockCredentialManagerClient; 78 class MockCredentialManagerClient;
79 class MockPresentationClient;
80 class MockScreenOrientationClient; 79 class MockScreenOrientationClient;
81 class MockWebSpeechRecognizer; 80 class MockWebSpeechRecognizer;
82 class MockWebUserMediaClient; 81 class MockWebUserMediaClient;
83 class RenderFrame; 82 class RenderFrame;
84 class SpellCheckClient; 83 class SpellCheckClient;
85 class TestInterfaces; 84 class TestInterfaces;
86 class WebTestDelegate; 85 class WebTestDelegate;
87 class WebTestInterfaces; 86 class WebTestInterfaces;
88 87
89 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that 88 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 void DidCloseChooser(); 124 void DidCloseChooser();
126 bool IsChooserShown(); 125 bool IsChooserShown();
127 126
128 void DisplayAsyncThen(const base::Closure& callback); 127 void DisplayAsyncThen(const base::Closure& callback);
129 128
130 void GetScreenOrientationForTesting(blink::WebScreenInfo&); 129 void GetScreenOrientationForTesting(blink::WebScreenInfo&);
131 MockScreenOrientationClient* GetScreenOrientationClientMock(); 130 MockScreenOrientationClient* GetScreenOrientationClientMock();
132 blink::WebMIDIClientMock* GetMIDIClientMock(); 131 blink::WebMIDIClientMock* GetMIDIClientMock();
133 MockWebSpeechRecognizer* GetSpeechRecognizerMock(); 132 MockWebSpeechRecognizer* GetSpeechRecognizerMock();
134 MockCredentialManagerClient* GetCredentialManagerClientMock(); 133 MockCredentialManagerClient* GetCredentialManagerClientMock();
135 MockPresentationClient* GetPresentationClientMock();
136 134
137 WebTaskList* mutable_task_list() { return &task_list_; } 135 WebTaskList* mutable_task_list() { return &task_list_; }
138 136
139 blink::WebView* GetWebView() const; 137 blink::WebView* GetWebView() const;
140 138
141 void PostSpellCheckEvent(const blink::WebString& event_name); 139 void PostSpellCheckEvent(const blink::WebString& event_name);
142 140
143 void SetAcceptLanguages(const std::string& accept_languages); 141 void SetAcceptLanguages(const std::string& accept_languages);
144 142
145 protected: 143 protected:
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 bool animate_scheduled_; 260 bool animate_scheduled_;
263 std::map<unsigned, std::string> resource_identifier_map_; 261 std::map<unsigned, std::string> resource_identifier_map_;
264 262
265 bool log_console_output_; 263 bool log_console_output_;
266 int chooser_count_; 264 int chooser_count_;
267 265
268 scoped_ptr<MockCredentialManagerClient> credential_manager_client_; 266 scoped_ptr<MockCredentialManagerClient> credential_manager_client_;
269 scoped_ptr<blink::WebMIDIClientMock> midi_client_; 267 scoped_ptr<blink::WebMIDIClientMock> midi_client_;
270 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_; 268 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_;
271 scoped_ptr<MockScreenOrientationClient> screen_orientation_client_; 269 scoped_ptr<MockScreenOrientationClient> screen_orientation_client_;
272 scoped_ptr<MockPresentationClient> presentation_client_;
273 270
274 std::string accept_languages_; 271 std::string accept_languages_;
275 272
276 private: 273 private:
277 DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase); 274 DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
278 }; 275 };
279 276
280 // WebTestProxy is used during LayoutTests and always instantiated, at time of 277 // WebTestProxy is used during LayoutTests and always instantiated, at time of
281 // writing with Base=RenderViewImpl. It does not directly inherit from it for 278 // writing with Base=RenderViewImpl. It does not directly inherit from it for
282 // layering purposes. 279 // layering purposes.
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 392
396 private: 393 private:
397 virtual ~WebTestProxy() {} 394 virtual ~WebTestProxy() {}
398 395
399 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 396 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
400 }; 397 };
401 398
402 } // namespace content 399 } // namespace content
403 400
404 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 401 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/web_test_delegate.h ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698