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

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

Issue 2297933002: blimp: Set up the CompositorDependencies for blimp in Chrome. (Closed)
Patch Set: retry gpu process failures after crbug.com/643282 Created 4 years, 3 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/mock_gpu_channel_establish_factory.h » ('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 388a9d9b45a43e6f4fd4cbe4408a7fa22ab07843..a53eee5d742b7e2c28aa93fd22241e7b51571415 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -30,6 +30,7 @@
#if defined(OS_ANDROID)
#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
+#include "content/test/mock_gpu_channel_establish_factory.h"
#endif
#if defined(OS_WIN)
@@ -245,6 +246,8 @@ void RenderViewHostTestHarness::SetUp() {
ImageTransportFactory::InitializeForUnitTests(
base::WrapUnique(new NoTransportImageTransportFactory));
#else
+ gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>();
+ ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
ui::ContextProviderFactory::SetInstance(
ContextProviderFactoryImpl::GetInstance());
#endif
@@ -314,6 +317,8 @@ void RenderViewHostTestHarness::TearDown() {
ImageTransportFactory::Terminate();
#else
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/mock_gpu_channel_establish_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698