BASELINE: Update Chromium to 62.0.3202.101

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

2 files changed, 17 insertions, 2 deletions

diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index fdb35cbd6eb..e4d49ab7c6d 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -59,7 +59,7 @@ android_resources("remoting_android_client_java_resources") {
 }
 
 remoting_android_client_java_tmpl("remoting_android_client_java") {
-  remoting_google_play_services_library = google_play_services_library
+  play_services_package = "//third_party/android_tools"
 }
 
 remoting_apk_tmpl("remoting_apk") {
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni
index 27e43265864..2da32881f50 100644
--- a/chromium/remoting/android/client_java_tmpl.gni
+++ b/chromium/remoting/android/client_java_tmpl.gni
@@ -79,6 +79,7 @@ template("remoting_android_client_java_tmpl") {
     deps = [
       "//base:base_java",
       "//remoting/android:remoting_android_client_java_resources",
+      "//remoting/android:remoting_apk_manifest",
       "//third_party/android_tools:android_support_annotations_java",
       "//third_party/android_tools:android_support_compat_java",
       "//third_party/android_tools:android_support_core_ui_java",
@@ -87,6 +88,20 @@ template("remoting_android_client_java_tmpl") {
       "//ui/android:ui_utils_java",
     ]
 
-    deps += [ invoker.remoting_google_play_services_library ]
+    if (defined(invoker.play_services_package)) {
+      deps += [
+        "${invoker.play_services_package}:google_play_services_auth_base_java",
+        "${invoker.play_services_package}:google_play_services_base_java",
+        "${invoker.play_services_package}:google_play_services_basement_java",
+      ]
+    }
+
+    # TODO(agrieve): Convert downstream to use play_services_package.
+    if (defined(invoker.remoting_google_play_services_library)) {
+      deps += [ invoker.remoting_google_play_services_library ]
+    }
+
+    # Manifest used for linting (determining unused resources).
+    android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
   }
 }