BASELINE: Update Chromium to 61.0.3163.99

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

11 files changed, 70 insertions, 11 deletions

diff --git a/chromium/third_party/gvr-android-sdk/BUILD.gn b/chromium/third_party/gvr-android-sdk/BUILD.gn
index 37067797eab..223ba74ba85 100644
--- a/chromium/third_party/gvr-android-sdk/BUILD.gn
+++ b/chromium/third_party/gvr-android-sdk/BUILD.gn
@@ -11,13 +11,37 @@ android_aar_prebuilt("controller_test_api_java") {
 
 android_aar_prebuilt("gvr_common_java") {
   aar_path = "common_library.aar"
-  proguard_configs = [ "src/proguard-gvr.txt" ]
+  proguard_configs = [ "proguard-gvr-chromium.txt" ]
   ignore_manifest = true  # Ignored because manifest merging is not supported (http://crbug.com/643967)
   ignore_native_libraries = true
+
+  # Ignore unused auto generated classes. Proguard will not strip them automatically because they
+  # implemented an interface that is called by VrEvent.
+  jar_excluded_patterns = [
+    "*google/common/logging/nano/Vr\$VREvent\$VrStreaming*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$VrHome*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$VrCore*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$TimeSeriesData*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$StreetView*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$SensorStats*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$Renderer.class",
+    "*google/common/logging/nano/Vr\$VREvent\$QrCodeScan.class",
+    "*google/common/logging/nano/Vr\$VREvent\$Photos*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$Lullaby*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$Launcher.class",
+    "*google/common/logging/nano/Vr\$VREvent\$Keyboard*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$JumpInspector*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$GConfigUpdate*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$EmbedVrWidget*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$EarthVr*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$DoublePrecisionTransform.class",
+    "*google/common/logging/nano/Vr\$VREvent\$Cyclops*.class",
+    "*google/common/logging/nano/Vr\$VREvent\$AudioStats.class",
+  ]
 }
 
 android_aar_prebuilt("gvr_controller_java") {
-  aar_path = "src/libraries/sdk-controller-1.10.0.aar"
+  aar_path = "src/libraries/sdk-controller-1.60.1.aar"
 }
 
 config("libgvr_config") {
diff --git a/chromium/third_party/gvr-android-sdk/README.chromium b/chromium/third_party/gvr-android-sdk/README.chromium
index 1ba339e0442..47a8431faca 100644
--- a/chromium/third_party/gvr-android-sdk/README.chromium
+++ b/chromium/third_party/gvr-android-sdk/README.chromium
@@ -1,9 +1,9 @@
 Name: Google VR SDK
 Short Name: gvr
 URL: https://github.com/googlevr/gvr-android-sdk
-Version: 1.10.0
-Date: 10 Feb 2017
-Revision: 8d1395957283ee13ebe2bc672ba24e5ca4ec343f
+Version: 1.60.1
+Date: 06 June 2017
+Revision: a27f768b13682189c23eed69656319db5ef7cbfc
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes
diff --git a/chromium/third_party/gvr-android-sdk/common_library.aar.sha1 b/chromium/third_party/gvr-android-sdk/common_library.aar.sha1
index 9295cfe02a1..ca06c1af3c8 100644
--- a/chromium/third_party/gvr-android-sdk/common_library.aar.sha1
+++ b/chromium/third_party/gvr-android-sdk/common_library.aar.sha1
@@ -1 +1 @@
-fb48131fdbeb6a353d1657743b51cd9bc08c3f7c
\ No newline at end of file
+2e65f66d39019f6c9be93c6cb28e2d434667daa5
\ No newline at end of file
diff --git a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1 b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1
index 4ffd258f8dc..c31069058d3 100644
--- a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1
+++ b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1
@@ -1 +1 @@
-a65b912586f1292188c42774d8b93534c6eda3a1
\ No newline at end of file
+a951bb4b47a6a250c2705cec4a772b606d1b39ae
\ No newline at end of file
diff --git a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1 b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1
index 2c735001336..51e10c70722 100644
--- a/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1
+++ b/chromium/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1
@@ -1 +1 @@
-ffd722cdf7bf26b6e3f719bf540b2f8121d41e45
\ No newline at end of file
+8536e70560ab4f3a3f4f93d9dd0fc639c898a4d7
\ No newline at end of file
diff --git a/chromium/third_party/gvr-android-sdk/proguard-gvr-chromium.txt b/chromium/third_party/gvr-android-sdk/proguard-gvr-chromium.txt
new file mode 100644
index 00000000000..5b303440ae1
--- /dev/null
+++ b/chromium/third_party/gvr-android-sdk/proguard-gvr-chromium.txt
@@ -0,0 +1,31 @@
+# Don't obfuscate any NDK/SDK code. This makes the debugging of stack traces in
+# in release builds easier.
+-keepnames class com.google.vr.ndk.** { *; }
+-keepnames class com.google.vr.sdk.** { *; }
+
+# These are part of the Java <-> native interfaces for GVR.
+-keepclasseswithmembernames,includedescriptorclasses class com.google.vr.** {
+    native <methods>;
+}
+
+-keep class com.google.vr.cardboard.UsedByNative
+-keep @com.google.vr.cardboard.UsedByNative class *
+-keepclassmembers class * {
+    @com.google.vr.cardboard.UsedByNative *;
+}
+
+-keep class com.google.vr.cardboard.annotations.UsedByNative
+-keep @com.google.vr.cardboard.annotations.UsedByNative class *
+-keepclassmembers class * {
+    @com.google.vr.cardboard.annotations.UsedByNative *;
+}
+
+-keep class com.google.vr.cardboard.annotations.UsedByReflection
+-keep @com.google.vr.cardboard.annotations.UsedByReflection class *
+-keepclassmembers class * {
+    @com.google.vr.cardboard.annotations.UsedByReflection *;
+}
+
+# All the above is copied from src/proguard-gvr.txt.
+# Chromium needs the following line to be able to exclude some unused auto generated classes.
+-dontwarn com.google.common.logging.nano.Vr$**
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 e9c4d4bd885..9200f48c245 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
@@ -5,3 +5,5 @@ v1.2 5400db0e25a24e0df9635ab268ef1058a60dfec2
 v1.3 db5eaf6e83a10e809b96375212d5c9dbbe517624
 v1.4 9afe32eb4676d4bcceae81605a3be6aa0e5be3d5
 v1.5 a02e2f95aa6f741f2be0ae03a4829e21fd749cf3
+v1.6 43b876df3398687dfa1ae059ef2f64009c76254e
+v1.7 d5c72438acffe723e7717c45deedd8431bc613e7
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 40e771ce35b..31836cd7ed7 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 @@
-a02e2f95aa6f741f2be0ae03a4829e21fd749cf3
\ No newline at end of file
+d5c72438acffe723e7717c45deedd8431bc613e7
\ 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 06abccf8475..4831ae618b0 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
@@ -8,3 +8,5 @@ v1.4 3024ad78653f11b53d9f15191eab9f11f70610e2
 vvv 64-bit
 v1.4 3e0cc24655847c7b922149754324a189e7092310
 v1.5 5d6d55728c7c728cef5416f37b0b71615719474e
+v1.6 abcdae2281956a76aa3b98d2e8f05a1975170dd0
+v1.7 fcfa178173a2c0cab9c7d51829c2ee76ab66e1d9
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 33fec9880e6..fb682073a03 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 @@
-5d6d55728c7c728cef5416f37b0b71615719474e
\ No newline at end of file
+fcfa178173a2c0cab9c7d51829c2ee76ab66e1d9
\ 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
index 5496f33d155..c69cf50dfba 100644
--- 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
@@ -1 +1 @@
-510b3f34e3a9ee4128e4329608ba59464549f6ca
\ No newline at end of file
+81cecc241ebe1e9d07f09850d0f83082ad52f225
\ No newline at end of file