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

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.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
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 972f34021b3a5ddaaa670a1a445ef43646e6fb07..439ffccedb40398ae6ee560f5d6bc3cab984af69 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -39,9 +39,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"
-#include "content/test/mock_gpu_channel_establish_factory.h"
#include "ui/android/screen_android.h"
#endif
@@ -476,9 +474,6 @@ class RenderWidgetHostTest : public testing::Test {
new NoTransportImageTransportFactory));
#endif
#if defined(OS_ANDROID)
- ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
- ui::ContextProviderFactory::SetInstance(
- ContextProviderFactoryImpl::GetInstance());
ui::SetScreenAndroid(); // calls display::Screen::SetScreenInstance().
#endif
#if defined(USE_AURA)
@@ -511,8 +506,6 @@ class RenderWidgetHostTest : public testing::Test {
#endif
#if defined(OS_ANDROID)
display::Screen::SetScreenInstance(nullptr);
- ui::ContextProviderFactory::SetInstance(nullptr);
- ContextProviderFactoryImpl::Terminate();
#endif
// Process all pending tasks to avoid leaks.
@@ -663,10 +656,6 @@ class RenderWidgetHostTest : public testing::Test {
double last_simulated_event_time_seconds_;
double simulated_event_time_delta_seconds_;
-#if defined(OS_ANDROID)
- MockGpuChannelEstablishFactory gpu_channel_factory_;
-#endif
-
private:
SyntheticWebTouchEvent touch_event_;

Powered by Google App Engine
This is Rietveld 408576698