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

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

Issue 2686243002: content/ui[Android]: Remove ContextProviderFactory. (Closed)
Patch Set: more rebase Created 3 years, 9 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 MockGpuChannelEstablishFactory;
44 class MockRenderProcessHost; 43 class MockRenderProcessHost;
45 class MockRenderProcessHostFactory; 44 class MockRenderProcessHostFactory;
46 class NavigationController; 45 class NavigationController;
47 class RenderProcessHostFactory; 46 class RenderProcessHostFactory;
48 class TestRenderFrameHostFactory; 47 class TestRenderFrameHostFactory;
49 class TestRenderViewHostFactory; 48 class TestRenderViewHostFactory;
50 class WebContents; 49 class WebContents;
51 struct WebPreferences; 50 struct WebPreferences;
52 51
53 // An interface and utility for driving tests of RenderFrameHost. 52 // An interface and utility for driving tests of RenderFrameHost.
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 class RenderViewHostTestEnabler { 172 class RenderViewHostTestEnabler {
174 public: 173 public:
175 RenderViewHostTestEnabler(); 174 RenderViewHostTestEnabler();
176 ~RenderViewHostTestEnabler(); 175 ~RenderViewHostTestEnabler();
177 176
178 private: 177 private:
179 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler); 178 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler);
180 friend class RenderViewHostTestHarness; 179 friend class RenderViewHostTestHarness;
181 180
182 #if defined(OS_ANDROID) 181 #if defined(OS_ANDROID)
183 std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_;
184 std::unique_ptr<display::Screen> screen_; 182 std::unique_ptr<display::Screen> screen_;
185 #endif 183 #endif
186 std::unique_ptr<MockRenderProcessHostFactory> rph_factory_; 184 std::unique_ptr<MockRenderProcessHostFactory> rph_factory_;
187 std::unique_ptr<TestRenderViewHostFactory> rvh_factory_; 185 std::unique_ptr<TestRenderViewHostFactory> rvh_factory_;
188 std::unique_ptr<TestRenderFrameHostFactory> rfh_factory_; 186 std::unique_ptr<TestRenderFrameHostFactory> rfh_factory_;
189 }; 187 };
190 188
191 // RenderViewHostTestHarness --------------------------------------------------- 189 // RenderViewHostTestHarness ---------------------------------------------------
192 class RenderViewHostTestHarness : public testing::Test { 190 class RenderViewHostTestHarness : public testing::Test {
193 public: 191 public:
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 #endif 284 #endif
287 std::unique_ptr<RenderViewHostTestEnabler> rvh_test_enabler_; 285 std::unique_ptr<RenderViewHostTestEnabler> rvh_test_enabler_;
288 RenderProcessHostFactory* factory_ = nullptr; 286 RenderProcessHostFactory* factory_ = nullptr;
289 287
290 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); 288 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
291 }; 289 };
292 290
293 } // namespace content 291 } // namespace content
294 292
295 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ 293 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/public/test/test_renderer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698