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

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

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/test/test_io_thread.h" 16 #include "base/test/test_io_thread.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "content/public/browser/native_web_keyboard_event.h" 18 #include "content/public/browser/native_web_keyboard_event.h"
19 #include "content/public/common/main_function_params.h" 19 #include "content/public/common/main_function_params.h"
20 #include "content/public/common/page_state.h" 20 #include "content/public/common/page_state.h"
21 #include "content/public/test/mock_render_thread.h" 21 #include "content/public/test/mock_render_thread.h"
22 #include "mojo/edk/test/scoped_ipc_support.h"
22 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
23 #include "third_party/WebKit/public/platform/Platform.h" 24 #include "third_party/WebKit/public/platform/Platform.h"
24 #include "third_party/WebKit/public/web/WebFrame.h" 25 #include "third_party/WebKit/public/web/WebFrame.h"
25 #include "third_party/WebKit/public/web/WebLeakDetector.h" 26 #include "third_party/WebKit/public/web/WebLeakDetector.h"
26 #include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
27 27
28 struct ViewMsg_Resize_Params; 28 struct ViewMsg_Resize_Params;
29 29
30 namespace blink { 30 namespace blink {
31 class WebInputElement; 31 class WebInputElement;
32 class WebWidget; 32 class WebWidget;
33 } 33 }
34 34
35 namespace gfx { 35 namespace gfx {
36 class Rect; 36 class Rect;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 scoped_ptr<ContentRendererClient> content_renderer_client_; 200 scoped_ptr<ContentRendererClient> content_renderer_client_;
201 scoped_ptr<MockRenderThread> render_thread_; 201 scoped_ptr<MockRenderThread> render_thread_;
202 202
203 // Used to setup the process so renderers can run. 203 // Used to setup the process so renderers can run.
204 scoped_ptr<RendererMainPlatformDelegate> platform_; 204 scoped_ptr<RendererMainPlatformDelegate> platform_;
205 scoped_ptr<MainFunctionParams> params_; 205 scoped_ptr<MainFunctionParams> params_;
206 scoped_ptr<base::CommandLine> command_line_; 206 scoped_ptr<base::CommandLine> command_line_;
207 207
208 // For Mojo. 208 // For Mojo.
209 scoped_ptr<base::TestIOThread> test_io_thread_; 209 scoped_ptr<base::TestIOThread> test_io_thread_;
210 scoped_ptr<mojo::test::ScopedIPCSupport> ipc_support_; 210 scoped_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support_;
211 211
212 #if defined(OS_MACOSX) 212 #if defined(OS_MACOSX)
213 scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_; 213 scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
214 #endif 214 #endif
215 215
216 private: 216 private:
217 void GoToOffset(int offset, const PageState& state); 217 void GoToOffset(int offset, const PageState& state);
218 }; 218 };
219 219
220 } // namespace content 220 } // namespace content
221 221
222 #endif // CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_ 222 #endif // CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/render_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698