BASELINE: Update Chromium to 60.0.3112.70

Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

8 files changed, 20 insertions, 2 deletions

diff --git a/chromium/third_party/gvr-android-sdk/BUILD.gn b/chromium/third_party/gvr-android-sdk/BUILD.gn
index 4540008589a..37067797eab 100644
--- a/chromium/third_party/gvr-android-sdk/BUILD.gn
+++ b/chromium/third_party/gvr-android-sdk/BUILD.gn
@@ -4,6 +4,11 @@
 
 import("//build/config/android/rules.gni")
 
+android_aar_prebuilt("controller_test_api_java") {
+  aar_path = "test-libraries/controller_test_api.aar"
+  proguard_configs = [ "test-libraries/proguard.txt" ]
+}
+
 android_aar_prebuilt("gvr_common_java") {
   aar_path = "common_library.aar"
   proguard_configs = [ "src/proguard-gvr.txt" ]
diff --git a/chromium/third_party/gvr-android-sdk/README.chromium b/chromium/third_party/gvr-android-sdk/README.chromium
index be951d954e9..1ba339e0442 100644
--- a/chromium/third_party/gvr-android-sdk/README.chromium
+++ b/chromium/third_party/gvr-android-sdk/README.chromium
@@ -33,3 +33,9 @@ In order to run automated end-to-end tests on VR features, VR Services
 are downloaded into test-apks/vr_services and test-apks/daydream_home,
 respectively. The downloaded APKs are the release APKs that are or were
 publicly available via the Play Store.
+In order to run automated end-to-end tests that involve a Daydream controller,
+controller_test_api.aar needs to be present. This allows us to send controller
+events using broadcasts like a real controller sends them over Bluetooth. The
+library is open-sourced similar to the other .aars, but since it's only useful
+for Chromium at the moment, it is uploaded to storage instead of to GitHub like
+the GVR SDK.
diff --git a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt
index 00c3e370330..e9c4d4bd885 100644
--- a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt
+++ b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/apk_version_history.txt
@@ -4,3 +4,4 @@ v1.1 12e7c98d6db3ab31a6f9c7e6f07351a9e4b85565
 v1.2 5400db0e25a24e0df9635ab268ef1058a60dfec2
 v1.3 db5eaf6e83a10e809b96375212d5c9dbbe517624
 v1.4 9afe32eb4676d4bcceae81605a3be6aa0e5be3d5
+v1.5 a02e2f95aa6f741f2be0ae03a4829e21fd749cf3
diff --git a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1 b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1
index dede8dcd318..40e771ce35b 100644
--- a/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1
+++ b/chromium/third_party/gvr-android-sdk/test-apks/daydream_home/daydream_home_current.apk.sha1
@@ -1 +1 @@
-9afe32eb4676d4bcceae81605a3be6aa0e5be3d5
\ No newline at end of file
+a02e2f95aa6f741f2be0ae03a4829e21fd749cf3
\ No newline at end of file
diff --git a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt
index 76959bc1dee..06abccf8475 100644
--- a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt
+++ b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/apk_version_history.txt
@@ -7,3 +7,4 @@ v1.4 3024ad78653f11b53d9f15191eab9f11f70610e2
 ^^^ 32-bit
 vvv 64-bit
 v1.4 3e0cc24655847c7b922149754324a189e7092310
+v1.5 5d6d55728c7c728cef5416f37b0b71615719474e
diff --git a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1 b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1
index cd53027dcf4..33fec9880e6 100644
--- a/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1
+++ b/chromium/third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk.sha1
@@ -1 +1 @@
-3e0cc24655847c7b922149754324a189e7092310
\ No newline at end of file
+5d6d55728c7c728cef5416f37b0b71615719474e
\ No newline at end of file
diff --git a/chromium/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1 b/chromium/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1
new file mode 100644
index 00000000000..5496f33d155
--- /dev/null
+++ b/chromium/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1
@@ -0,0 +1 @@
+510b3f34e3a9ee4128e4329608ba59464549f6ca
\ No newline at end of file
diff --git a/chromium/third_party/gvr-android-sdk/test-libraries/proguard.txt b/chromium/third_party/gvr-android-sdk/test-libraries/proguard.txt
new file mode 100644
index 00000000000..9c85a884bf7
--- /dev/null
+++ b/chromium/third_party/gvr-android-sdk/test-libraries/proguard.txt
@@ -0,0 +1,4 @@
+# Suppress some warnings that block compilation in release builds, but don't
+# actually affect anything
+-dontwarn java.awt.**
+-dontwarn javax.lang.model.element.Modifier