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

ui/android/BUILD.gn

Index: ui/android/BUILD.gn
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
index 4a5187f12e6d5d8a2c064985307022c5403da101..ce97690e0f0176fac2500d805903e35d9ae966c7 100644
--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
@@ -15,6 +15,8 @@ component("android") {
     "context_provider_factory.h",
     "delegated_frame_host_android.cc",
     "delegated_frame_host_android.h",
+    "display_android_manager.cc",
+    "display_android_manager.h",
     "edge_effect.cc",
     "edge_effect.h",
     "edge_effect_base.cc",
@@ -32,6 +34,7 @@ component("android") {
     "resources/resource_manager_impl.cc",
     "resources/resource_manager_impl.h",
     "resources/ui_resource_provider.h",
+    "screen_android.h",
     "ui_android_export.h",
     "ui_android_jni_registrar.cc",
     "ui_android_jni_registrar.h",
@@ -58,10 +61,24 @@ component("android") {
   ]
 }
 
+static_library("test_support") {
+  testonly = true
+  sources = [
+    "dummy_screen_android.cc",
+    "screen_android_for_tests.h",

[boliu, 2016/11/14 20:49:59]

just match the cc file, so dummy_screen_android.h

[Tima Vaisburd, 2016/11/14 22:19:38]

Done, I also renamed the creation function to CreateDummyScreenAndroid() that
seems more logical now.

+  ]
+
+  deps = [
+    "//ui/android",
+    "//ui/display",
+  ]
+}
+
 generate_jni("ui_android_jni_headers") {
   sources = [
     "java/src/org/chromium/ui/base/ViewAndroidDelegate.java",
     "java/src/org/chromium/ui/base/WindowAndroid.java",
+    "java/src/org/chromium/ui/display/DisplayAndroidManager.java",
     "java/src/org/chromium/ui/resources/ResourceManager.java",
   ]
   jni_package = "ui_android"