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

content/public/test/test_renderer_host.h

Index: content/public/test/test_renderer_host.h
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index afd42d1758b259580651140b016bf8bca7736f86..b9d04a20acb5d58023e334b005d496ceeececd9f 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -28,6 +28,10 @@ class AuraTestHelper;
 }
 }
 
+namespace display {
+class Screen;
+}
+
 namespace ui {
 class ScopedOleInitializer;
 }
@@ -278,6 +282,7 @@ class RenderViewHostTestHarness : public testing::Test {
 #endif
 #if defined(OS_ANDROID)
   std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_;
+  std::unique_ptr<display::Screen> screen_;
 #endif
   RenderViewHostTestEnabler rvh_test_enabler_;