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

chromecast/browser/cast_browser_main_parts.cc

Index: chromecast/browser/cast_browser_main_parts.cc
diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
index d098b063e22e7e5eed15cac013c518ba6368119a..8bfd32cf47bdffa16a5fb8f1d6623cf7791e1300 100644
--- a/chromecast/browser/cast_browser_main_parts.cc
+++ b/chromecast/browser/cast_browser_main_parts.cc
@@ -75,6 +75,8 @@
 #include "chromecast/app/android/crash_handler.h"
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
+#include "ui/android/screen_android.h"
+#include "ui/display/screen.h"
 #else
 #include "chromecast/net/network_change_notifier_factory_cast.h"
 #endif
@@ -410,7 +412,9 @@ int CastBrowserMainParts::PreCreateThreads() {
       sys_info->GetGlVersion());
 #endif
 
-#if defined(USE_AURA)
+#if defined(OS_ANDROID)
+  display::Screen::SetScreenInstance(ui::CreateScreenAndroid());
+#elif defined(USE_AURA)
   cast_browser_process_->SetCastScreen(base::WrapUnique(new CastScreen()));
   DCHECK(!display::Screen::GetScreen());
   display::Screen::SetScreenInstance(cast_browser_process_->cast_screen());