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

content/public/test/test_renderer_host.cc

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 01f729a9be75d29c009f325f8508ddaff9b662f6..16d5c6571f7ab8ed4650199b0157a6ca200405d8 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -32,6 +32,8 @@
 #if defined(OS_ANDROID)
 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
 #include "content/test/mock_gpu_channel_establish_factory.h"
+#include "ui/android/screen_android.h"
+#include "ui/display/screen.h"
 #endif
 
 #if defined(OS_WIN)
@@ -243,6 +245,9 @@ void RenderViewHostTestHarness::SetUp() {
   ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
   ui::ContextProviderFactory::SetInstance(
       ContextProviderFactoryImpl::GetInstance());
+  if (!screen_)
+    screen_.reset(ui::CreateScreenAndroidForTests());
+  display::Screen::SetScreenInstance(screen_.get());
 #endif
 #if defined(USE_AURA)
   ui::ContextFactory* context_factory =
@@ -308,6 +313,7 @@ void RenderViewHostTestHarness::TearDown() {
     // must be shut down before the ImageTransportFactory.
     ImageTransportFactory::Terminate();
 #else
+  display::Screen::SetScreenInstance(nullptr);
   ui::ContextProviderFactory::SetInstance(nullptr);
   ContextProviderFactoryImpl::Terminate();
   gpu_channel_factory_.reset();