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

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 2190033002: content: Add ContextProviderFactory to create a render ContextProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove display_ DCHECK. 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
Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index b83c7e27cab137550e08e6e6c9672be978169905..367cfd79d013800be53e70f5fabf96e88a638b21 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -37,6 +37,7 @@
#include "ui/gfx/canvas.h"
#if defined(OS_ANDROID)
+#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
#include "content/browser/renderer_host/render_widget_host_view_android.h"
#endif
@@ -466,6 +467,10 @@ class RenderWidgetHostTest : public testing::Test {
std::unique_ptr<ImageTransportFactory>(
new NoTransportImageTransportFactory));
#endif
+#if defined(OS_ANDROID)
+ ui::ContextProviderFactory::SetInstance(
+ ContextProviderFactoryImpl::GetInstance());
+#endif
#if defined(USE_AURA)
screen_.reset(aura::TestScreen::Create(gfx::Size()));
display::Screen::SetScreenInstance(screen_.get());
@@ -494,6 +499,9 @@ class RenderWidgetHostTest : public testing::Test {
#if defined(USE_AURA) || defined(OS_MACOSX)
ImageTransportFactory::Terminate();
#endif
+#if defined(OS_ANDROID)
+ ui::ContextProviderFactory::SetInstance(nullptr);
+#endif
// Process all pending tasks to avoid leaks.
base::RunLoop().RunUntilIdle();

Powered by Google App Engine
This is Rietveld 408576698