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

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index f2794fed1876d70b7db9a12de54bbfdbb331cda5..2ab825847a2c96f70c52b165426bd8d77e3aca29 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -359,6 +359,7 @@ static_library("test_support") {
       "//device/geolocation:geolocation_java",
       "//media/capture/video/android:android",
       "//ui/android",
+      "//ui/android:test_support",
       "//ui/shell_dialogs",
     ]
   }
@@ -1622,6 +1623,7 @@ test("content_unittests") {
       "//device/geolocation:geolocation_java",
       "//media/capture/content/android",
       "//media/capture/content/android:screen_capture_java",
+      "//ui/android:android",
       "//v8:v8_external_startup_data_assets",
     ]