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

Side by Side Diff: content/public/test/render_view_test.h

Issue 1501343002: Prepare chrome to use the new Mojo EDK by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable turning on in this cl Created 5 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PUBLIC_TEST_RENDER_VIEW_TEST_H_ 5 #ifndef CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_
6 #define CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_ 6 #define CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/test/test_io_thread.h"
14 #include "content/public/browser/native_web_keyboard_event.h" 15 #include "content/public/browser/native_web_keyboard_event.h"
15 #include "content/public/common/main_function_params.h" 16 #include "content/public/common/main_function_params.h"
16 #include "content/public/common/page_state.h" 17 #include "content/public/common/page_state.h"
17 #include "content/public/test/mock_render_thread.h" 18 #include "content/public/test/mock_render_thread.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 #include "third_party/WebKit/public/platform/Platform.h" 20 #include "third_party/WebKit/public/platform/Platform.h"
20 #include "third_party/WebKit/public/web/WebFrame.h" 21 #include "third_party/WebKit/public/web/WebFrame.h"
21 #include "third_party/WebKit/public/web/WebLeakDetector.h" 22 #include "third_party/WebKit/public/web/WebLeakDetector.h"
23 #include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
22 24
23 struct ViewMsg_Resize_Params; 25 struct ViewMsg_Resize_Params;
24 26
25 namespace blink { 27 namespace blink {
26 class WebInputElement; 28 class WebInputElement;
27 class WebWidget; 29 class WebWidget;
28 } 30 }
29 31
30 namespace gfx { 32 namespace gfx {
31 class Rect; 33 class Rect;
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 scoped_ptr<ContentClient> content_client_; 189 scoped_ptr<ContentClient> content_client_;
188 scoped_ptr<ContentBrowserClient> content_browser_client_; 190 scoped_ptr<ContentBrowserClient> content_browser_client_;
189 scoped_ptr<ContentRendererClient> content_renderer_client_; 191 scoped_ptr<ContentRendererClient> content_renderer_client_;
190 scoped_ptr<MockRenderThread> render_thread_; 192 scoped_ptr<MockRenderThread> render_thread_;
191 193
192 // Used to setup the process so renderers can run. 194 // Used to setup the process so renderers can run.
193 scoped_ptr<RendererMainPlatformDelegate> platform_; 195 scoped_ptr<RendererMainPlatformDelegate> platform_;
194 scoped_ptr<MainFunctionParams> params_; 196 scoped_ptr<MainFunctionParams> params_;
195 scoped_ptr<base::CommandLine> command_line_; 197 scoped_ptr<base::CommandLine> command_line_;
196 198
199 // For Mojo.
200 scoped_ptr<base::TestIOThread> test_io_thread_;
201 scoped_ptr<mojo::test::ScopedIPCSupport> ipc_support_;
202
197 #if defined(OS_MACOSX) 203 #if defined(OS_MACOSX)
198 scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_; 204 scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
199 #endif 205 #endif
200 206
201 private: 207 private:
202 void GoToOffset(int offset, const PageState& state); 208 void GoToOffset(int offset, const PageState& state);
203 }; 209 };
204 210
205 } // namespace content 211 } // namespace content
206 212
207 #endif // CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_ 213 #endif // CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698