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

Unified Diff: content/public/test/test_renderer_host.cc

Issue 2686243002: content/ui[Android]: Remove ContextProviderFactory. (Closed)
Patch Set: more rebase Created 3 years, 10 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/test_renderer_host.cc
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index 91354a1caec4d702618cc932f8a2b3fa171aea28..538a2ccbff5ccb373e97f3fe458e113df2f68736 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -31,8 +31,6 @@
#include "ui/base/test/material_design_controller_test_api.h"
#if defined(OS_ANDROID)
-#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
-#include "content/test/mock_gpu_channel_establish_factory.h"
#include "ui/android/dummy_screen_android.h"
#include "ui/display/screen.h"
#endif
@@ -135,10 +133,6 @@ RenderViewHostTestEnabler::RenderViewHostTestEnabler()
ImageTransportFactory::InitializeForUnitTests(
base::WrapUnique(new NoTransportImageTransportFactory));
#else
- gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>();
- ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
- ui::ContextProviderFactory::SetInstance(
- ContextProviderFactoryImpl::GetInstance());
if (!screen_)
screen_.reset(ui::CreateDummyScreenAndroid());
display::Screen::SetScreenInstance(screen_.get());
@@ -159,9 +153,6 @@ RenderViewHostTestEnabler::~RenderViewHostTestEnabler() {
ImageTransportFactory::Terminate();
#else
display::Screen::SetScreenInstance(nullptr);
- ui::ContextProviderFactory::SetInstance(nullptr);
- ContextProviderFactoryImpl::Terminate();
- gpu_channel_factory_.reset();
#endif
}
« 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