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

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

Issue 308073011: test_runner: Migrate WebUserMediaClientMock to our Chromium C++ style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 struct WebPluginParams; 68 struct WebPluginParams;
69 struct WebPoint; 69 struct WebPoint;
70 struct WebSize; 70 struct WebSize;
71 struct WebWindowFeatures; 71 struct WebWindowFeatures;
72 typedef unsigned WebColor; 72 typedef unsigned WebColor;
73 } 73 }
74 74
75 namespace content { 75 namespace content {
76 76
77 class MockWebSpeechRecognizer; 77 class MockWebSpeechRecognizer;
78 class MockWebUserMediaClient;
78 class RenderFrame; 79 class RenderFrame;
79 class SpellCheckClient; 80 class SpellCheckClient;
80 class TestInterfaces; 81 class TestInterfaces;
81 class WebTestDelegate; 82 class WebTestDelegate;
82 class WebTestInterfaces; 83 class WebTestInterfaces;
83 class WebUserMediaClientMock;
84 84
85 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that 85 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that
86 // WebTestProxy does the bridge between RenderViewImpl and WebTestProxyBase and 86 // WebTestProxy does the bridge between RenderViewImpl and WebTestProxyBase and
87 // when it requires a behavior to be different from the usual, it will call 87 // when it requires a behavior to be different from the usual, it will call
88 // WebTestProxyBase that implements the expected behavior. 88 // WebTestProxyBase that implements the expected behavior.
89 // See WebTestProxy class comments for more information. 89 // See WebTestProxy class comments for more information.
90 class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback { 90 class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
91 public: 91 public:
92 void SetInterfaces(WebTestInterfaces* interfaces); 92 void SetInterfaces(WebTestInterfaces* interfaces);
93 void SetDelegate(WebTestDelegate* delegate); 93 void SetDelegate(WebTestDelegate* delegate);
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 244
245 blink::WebWidget* web_widget() const { return web_widget_; } 245 blink::WebWidget* web_widget() const { return web_widget_; }
246 246
247 TestInterfaces* test_interfaces_; 247 TestInterfaces* test_interfaces_;
248 WebTestDelegate* delegate_; 248 WebTestDelegate* delegate_;
249 blink::WebWidget* web_widget_; 249 blink::WebWidget* web_widget_;
250 250
251 WebTaskList task_list_; 251 WebTaskList task_list_;
252 252
253 scoped_ptr<SpellCheckClient> spellcheck_; 253 scoped_ptr<SpellCheckClient> spellcheck_;
254 scoped_ptr<WebUserMediaClientMock> user_media_client_; 254 scoped_ptr<MockWebUserMediaClient> user_media_client_;
255 255
256 bool animate_scheduled_; 256 bool animate_scheduled_;
257 std::map<unsigned, std::string> resource_identifier_map_; 257 std::map<unsigned, std::string> resource_identifier_map_;
258 std::deque<base::Callback<void(const SkBitmap&)> > 258 std::deque<base::Callback<void(const SkBitmap&)> >
259 composite_and_readback_callbacks_; 259 composite_and_readback_callbacks_;
260 260
261 bool log_console_output_; 261 bool log_console_output_;
262 int chooser_count_; 262 int chooser_count_;
263 263
264 scoped_ptr<blink::WebMIDIClientMock> midi_client_; 264 scoped_ptr<blink::WebMIDIClientMock> midi_client_;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 return WebTestProxyBase::acceptLanguages(); 380 return WebTestProxyBase::acceptLanguages();
381 } 381 }
382 382
383 private: 383 private:
384 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 384 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
385 }; 385 };
386 386
387 } // namespace content 387 } // namespace content
388 388
389 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 389 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/mock_web_user_media_client.cc ('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