Reland of Android: support multiple displays on C++ side

content/browser/renderer_host/render_widget_host_unittest.cc

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 75185179fd9fb39db99a7f5cad1aecaac6f85424..41a005ce451e3ae463b6052f494adcb7a40c0aaf 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -40,6 +40,7 @@
 #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
 
 #if defined(USE_AURA) || defined(OS_MACOSX)
@@ -476,8 +477,9 @@ class RenderWidgetHostTest : public testing::Test {
     ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
     ui::ContextProviderFactory::SetInstance(
         ContextProviderFactoryImpl::GetInstance());
-#endif
-#if defined(USE_AURA)
+    screen_.reset(ui::CreateScreenAndroid());
+    display::Screen::SetScreenInstance(screen_.get());
+#elif defined(USE_AURA)
     screen_.reset(aura::TestScreen::Create(gfx::Size()));
     display::Screen::SetScreenInstance(screen_.get());
 #endif
@@ -498,7 +500,7 @@ class RenderWidgetHostTest : public testing::Test {
     process_ = NULL;
     browser_context_.reset();
 
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_ANDROID)
     display::Screen::SetScreenInstance(nullptr);
     screen_.reset();
 #endif