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

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

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
« no previous file with comments | « content/public/test/test_renderer_host.h ('k') | content/test/BUILD.gn » ('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 #include "content/public/test/test_renderer_host.h" 5 #include "content/public/test/test_renderer_host.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 13 matching lines...) Expand all
24 #include "content/test/content_browser_sanity_checker.h" 24 #include "content/test/content_browser_sanity_checker.h"
25 #include "content/test/test_render_frame_host.h" 25 #include "content/test/test_render_frame_host.h"
26 #include "content/test/test_render_frame_host_factory.h" 26 #include "content/test/test_render_frame_host_factory.h"
27 #include "content/test/test_render_view_host.h" 27 #include "content/test/test_render_view_host.h"
28 #include "content/test/test_render_view_host_factory.h" 28 #include "content/test/test_render_view_host_factory.h"
29 #include "content/test/test_web_contents.h" 29 #include "content/test/test_web_contents.h"
30 #include "ui/base/material_design/material_design_controller.h" 30 #include "ui/base/material_design/material_design_controller.h"
31 #include "ui/base/test/material_design_controller_test_api.h" 31 #include "ui/base/test/material_design_controller_test_api.h"
32 32
33 #if defined(OS_ANDROID) 33 #if defined(OS_ANDROID)
34 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
35 #include "content/test/mock_gpu_channel_establish_factory.h"
36 #include "ui/android/dummy_screen_android.h" 34 #include "ui/android/dummy_screen_android.h"
37 #include "ui/display/screen.h" 35 #include "ui/display/screen.h"
38 #endif 36 #endif
39 37
40 #if defined(OS_WIN) 38 #if defined(OS_WIN)
41 #include "ui/base/win/scoped_ole_initializer.h" 39 #include "ui/base/win/scoped_ole_initializer.h"
42 #endif 40 #endif
43 41
44 #if defined(USE_AURA) 42 #if defined(USE_AURA)
45 #include "ui/aura/test/aura_test_helper.h" 43 #include "ui/aura/test/aura_test_helper.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // RenderViewHostTestEnabler -------------------------------------------------- 126 // RenderViewHostTestEnabler --------------------------------------------------
129 127
130 RenderViewHostTestEnabler::RenderViewHostTestEnabler() 128 RenderViewHostTestEnabler::RenderViewHostTestEnabler()
131 : rph_factory_(new MockRenderProcessHostFactory()), 129 : rph_factory_(new MockRenderProcessHostFactory()),
132 rvh_factory_(new TestRenderViewHostFactory(rph_factory_.get())), 130 rvh_factory_(new TestRenderViewHostFactory(rph_factory_.get())),
133 rfh_factory_(new TestRenderFrameHostFactory()) { 131 rfh_factory_(new TestRenderFrameHostFactory()) {
134 #if !defined(OS_ANDROID) 132 #if !defined(OS_ANDROID)
135 ImageTransportFactory::InitializeForUnitTests( 133 ImageTransportFactory::InitializeForUnitTests(
136 base::WrapUnique(new NoTransportImageTransportFactory)); 134 base::WrapUnique(new NoTransportImageTransportFactory));
137 #else 135 #else
138 gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>();
139 ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
140 ui::ContextProviderFactory::SetInstance(
141 ContextProviderFactoryImpl::GetInstance());
142 if (!screen_) 136 if (!screen_)
143 screen_.reset(ui::CreateDummyScreenAndroid()); 137 screen_.reset(ui::CreateDummyScreenAndroid());
144 display::Screen::SetScreenInstance(screen_.get()); 138 display::Screen::SetScreenInstance(screen_.get());
145 #endif 139 #endif
146 #if defined(OS_MACOSX) 140 #if defined(OS_MACOSX)
147 if (base::ThreadTaskRunnerHandle::IsSet()) 141 if (base::ThreadTaskRunnerHandle::IsSet())
148 ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get()); 142 ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get());
149 #endif // OS_MACOSX 143 #endif // OS_MACOSX
150 } 144 }
151 145
152 RenderViewHostTestEnabler::~RenderViewHostTestEnabler() { 146 RenderViewHostTestEnabler::~RenderViewHostTestEnabler() {
153 #if defined(OS_MACOSX) 147 #if defined(OS_MACOSX)
154 ui::WindowResizeHelperMac::Get()->ShutdownForTests(); 148 ui::WindowResizeHelperMac::Get()->ShutdownForTests();
155 #endif // OS_MACOSX 149 #endif // OS_MACOSX
156 #if !defined(OS_ANDROID) 150 #if !defined(OS_ANDROID)
157 // RenderWidgetHostView holds on to a reference to SurfaceManager, so it 151 // RenderWidgetHostView holds on to a reference to SurfaceManager, so it
158 // must be shut down before the ImageTransportFactory. 152 // must be shut down before the ImageTransportFactory.
159 ImageTransportFactory::Terminate(); 153 ImageTransportFactory::Terminate();
160 #else 154 #else
161 display::Screen::SetScreenInstance(nullptr); 155 display::Screen::SetScreenInstance(nullptr);
162 ui::ContextProviderFactory::SetInstance(nullptr);
163 ContextProviderFactoryImpl::Terminate();
164 gpu_channel_factory_.reset();
165 #endif 156 #endif
166 } 157 }
167 158
168 159
169 // RenderViewHostTestHarness -------------------------------------------------- 160 // RenderViewHostTestHarness --------------------------------------------------
170 161
171 RenderViewHostTestHarness::RenderViewHostTestHarness() 162 RenderViewHostTestHarness::RenderViewHostTestHarness()
172 : thread_bundle_options_(TestBrowserThreadBundle::DEFAULT) {} 163 : thread_bundle_options_(TestBrowserThreadBundle::DEFAULT) {}
173 164
174 RenderViewHostTestHarness::~RenderViewHostTestHarness() { 165 RenderViewHostTestHarness::~RenderViewHostTestHarness() {
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 325
335 void RenderViewHostTestHarness::SetRenderProcessHostFactory( 326 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
336 RenderProcessHostFactory* factory) { 327 RenderProcessHostFactory* factory) {
337 if (rvh_test_enabler_) 328 if (rvh_test_enabler_)
338 rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory); 329 rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory);
339 else 330 else
340 factory_ = factory; 331 factory_ = factory;
341 } 332 }
342 333
343 } // namespace content 334 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/test_renderer_host.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698