[Build Android] Delete redundant third_party/guava 6/9

This CL:
- Replaces //third_party/guava:guava_android_java dependencies with
//third_party/android_deps:guava_android_java
- Deletes //third_party/guava

Change-Id: If5536c8f3685d66a9136c76be229f7f44cd4a138
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560401
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832984}

chrome/android/BUILD.gn

@@ -924,8 +924,10 @@ junit_binary("chrome_junit_tests") {
     "//third_party/android_deps:androidx_test_core_java",
     "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:chromium_play_services_availability_shadows_java",
+    "//third_party/android_deps:com_google_guava_listenablefuture_java",
     "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
     "//third_party/android_deps:dagger_java",
+    "//third_party/android_deps:guava_android_java",
     "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
     "//third_party/android_support_test_runner:rules_java",
@@ -935,7 +937,6 @@ junit_binary("chrome_junit_tests") {
     "//third_party/blink/public/mojom:mojom_platform_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/google-truth:google_truth_java",
-    "//third_party/guava:guava_android_java",
     "//third_party/hamcrest:hamcrest_java",
     "//ui/android:ui_java",
     "//ui/base/mojom:mojom_java",

chrome/test/android/BUILD.gn

@@ -110,8 +110,8 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") {
     "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_android_support_drawerlayout_java",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:guava_android_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/guava:guava_android_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//ui/android:ui_java_test_support",

third_party/guava/BUILD.gn

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-java_group("guava_android_java") {
-  deps = [ "//third_party/android_deps:guava_android_java" ]
-}

third_party/guava/OWNERS

-bjoyce@chromium.org
-hypan@google.com
-wnwen@chromium.org
-
-# COMPONENT: Test>Android

third_party/guava/README.chromium

-Name: Google Core Libraries for Java
-Short Name: guava
-URL: https://github.com/google/guava
-Version: 25.1
-CPEPrefix: cpe:/a:google:guava:25.1
-License: Apache 2.0
-License File: NOT_SHIPPED
-Security Critical: no
-License Android Compatible: yes
-
-Description:
-The Guava project contains several of Google's core libraries that we rely on
-in our Java-based projects: collections, caching, primitives support,
-concurrency libraries, common annotations, string processing, I/O, and so forth.
-IMPORTANT: There should only be one version of espresso library
-(crbug.com/622057)
-
-Local Modifications: None

third_party/guava/cipd.yaml

-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
-
-# See ./BUILD.gn for why we have a -android.jar version.
-# Example for updating guava in the current dir:
-#   Run:
-#     cipd auth-login
-#     rm lib/guava.jar lib/guava-android.jar
-#     wget https://repo1.maven.org/maven2/com/google/guava/guava/25.1-android/guava-25.1-android.jar
-#              -O lib/guava-android.jar
-#     cipd create --pkg-def cipd.yaml -tag version:25.1-cr0
-#   Manually update:
-#     README.chromium (version number)
-
-package: chromium/third_party/guava
-description: guava java library
-data:
-  - file: lib/guava-android.jar