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

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

Issue 2250473005: content: Fix Context creation logic in ContextProviderFactoryImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use mock factory Created 4 years, 4 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 d385871bbf9ea30a84975834abc2050cec70f82a..44c741cdbe0cd4ab451ee8284be03b9fcdbd77fa 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)
@@ -203,6 +204,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
@@ -272,6 +275,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