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

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

Issue 2785523002: Reduce/remove usage of BrowserThread in content/browser/loader. (Closed)
Patch Set: Fix unittests redness Created 3 years, 8 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 (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_TEST_RENDERER_HOST_H_ 5 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
6 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ 6 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 22 matching lines...) Expand all
33 } 33 }
34 34
35 namespace ui { 35 namespace ui {
36 class ScopedOleInitializer; 36 class ScopedOleInitializer;
37 } 37 }
38 38
39 namespace content { 39 namespace content {
40 40
41 class BrowserContext; 41 class BrowserContext;
42 class ContentBrowserSanityChecker; 42 class ContentBrowserSanityChecker;
43 class LoaderGlobals;
43 class MockRenderProcessHost; 44 class MockRenderProcessHost;
44 class MockRenderProcessHostFactory; 45 class MockRenderProcessHostFactory;
45 class NavigationController; 46 class NavigationController;
46 class RenderProcessHostFactory; 47 class RenderProcessHostFactory;
47 class TestRenderFrameHostFactory; 48 class TestRenderFrameHostFactory;
48 class TestRenderViewHostFactory; 49 class TestRenderViewHostFactory;
49 class WebContents; 50 class WebContents;
50 struct WebPreferences; 51 struct WebPreferences;
51 52
52 // An interface and utility for driving tests of RenderFrameHost. 53 // An interface and utility for driving tests of RenderFrameHost.
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 private: 187 private:
187 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler); 188 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler);
188 friend class RenderViewHostTestHarness; 189 friend class RenderViewHostTestHarness;
189 190
190 #if defined(OS_ANDROID) 191 #if defined(OS_ANDROID)
191 std::unique_ptr<display::Screen> screen_; 192 std::unique_ptr<display::Screen> screen_;
192 #endif 193 #endif
193 std::unique_ptr<MockRenderProcessHostFactory> rph_factory_; 194 std::unique_ptr<MockRenderProcessHostFactory> rph_factory_;
194 std::unique_ptr<TestRenderViewHostFactory> rvh_factory_; 195 std::unique_ptr<TestRenderViewHostFactory> rvh_factory_;
195 std::unique_ptr<TestRenderFrameHostFactory> rfh_factory_; 196 std::unique_ptr<TestRenderFrameHostFactory> rfh_factory_;
197 std::unique_ptr<LoaderGlobals> loader_globals_;
196 }; 198 };
197 199
198 // RenderViewHostTestHarness --------------------------------------------------- 200 // RenderViewHostTestHarness ---------------------------------------------------
199 class RenderViewHostTestHarness : public testing::Test { 201 class RenderViewHostTestHarness : public testing::Test {
200 public: 202 public:
201 RenderViewHostTestHarness(); 203 RenderViewHostTestHarness();
202 ~RenderViewHostTestHarness() override; 204 ~RenderViewHostTestHarness() override;
203 205
204 NavigationController& controller(); 206 NavigationController& controller();
205 207
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 std::unique_ptr<BrowserContext> browser_context_; 287 std::unique_ptr<BrowserContext> browser_context_;
286 288
287 std::unique_ptr<WebContents> contents_; 289 std::unique_ptr<WebContents> contents_;
288 #if defined(OS_WIN) 290 #if defined(OS_WIN)
289 std::unique_ptr<ui::ScopedOleInitializer> ole_initializer_; 291 std::unique_ptr<ui::ScopedOleInitializer> ole_initializer_;
290 #endif 292 #endif
291 #if defined(USE_AURA) 293 #if defined(USE_AURA)
292 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_; 294 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
293 #endif 295 #endif
294 std::unique_ptr<RenderViewHostTestEnabler> rvh_test_enabler_; 296 std::unique_ptr<RenderViewHostTestEnabler> rvh_test_enabler_;
297
298 std::unique_ptr<LoaderGlobals> loader_globals_;
299
295 RenderProcessHostFactory* factory_ = nullptr; 300 RenderProcessHostFactory* factory_ = nullptr;
296 301
297 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); 302 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
298 }; 303 };
299 304
300 } // namespace content 305 } // namespace content
301 306
302 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ 307 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698