Use gn visibility to limit visibility of //chrome/.../appmenu/internal

Previously a DEPS rule was limiting import of internal app menu classes
in chrome/android/java. This CL uses GN visibility instead, which can be
controlled from within the component itself.

BUG=966644

Change-Id: I4be0c36f81271259a4f71388db7d0671bd8ba699
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934521
Auto-Submit: Theresa  <twellington@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760089}

chrome/android/BUILD.gn

@@ -852,7 +852,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/thumbnail:java",
     "//chrome/browser/thumbnail:javatests",
     "//chrome/browser/ui/android/appmenu:java",
-    "//chrome/browser/ui/android/appmenu:test_support_java",
+    "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/upboarding/query_tiles:query_tiles_javatests",

chrome/browser/ui/android/appmenu/BUILD.gn

 # Copyright 2019 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")
 import("//chrome/android/features/android_library_factory_tmpl.gni")
 
@@ -24,20 +25,6 @@ android_library_factory("factory_java") {
   sources = [ "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinatorFactory.java" ]
 }
 
-android_library("test_support_java") {
-  testonly = true
-
-  sources = [
-    "test/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTestSupport.java",
-    "test/java/src/org/chromium/chrome/browser/ui/appmenu/TestAppMenuObserver.java",
-  ]
-  deps = [
-    "//base:base_java_test_support",
-    "//chrome/browser/ui/android/appmenu:java",
-    "//chrome/browser/ui/android/appmenu/internal:java",
-  ]
-}
-
 android_resources("java_resources") {
   custom_package = "org.chromium.chrome.browser.ui.appmenu"
   sources = [ "java/res/values/styles.xml" ]

chrome/browser/ui/android/appmenu/internal/BUILD.gn

@@ -5,6 +5,12 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
+  visibility = [
+    ":*",
+    "//chrome/android:chrome_all_java",
+    "//chrome/browser/ui/android/appmenu/test:*",
+  ]
+
   sources = [
     "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java",
     "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuAdapter.java",
@@ -64,7 +70,7 @@ android_library("javatests") {
     "//base:base_java_test_support",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/ui/android/appmenu:java",
-    "//chrome/browser/ui/android/appmenu:test_support_java",
+    "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/widget/android:test_support_java",
     "//content/public/test/android:content_java_test_support",

chrome/browser/ui/android/appmenu/test/BUILD.gn

+# Copyright 2020 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")
+
+android_library("test_support_java") {
+  testonly = true
+
+  sources = [
+    "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTestSupport.java",
+    "java/src/org/chromium/chrome/browser/ui/appmenu/TestAppMenuObserver.java",
+  ]
+  deps = [
+    "//base:base_java_test_support",
+    "//chrome/browser/ui/android/appmenu:java",
+    "//chrome/browser/ui/android/appmenu/internal:java",
+  ]
+}

chrome/test/android/BUILD.gn

@@ -43,7 +43,7 @@ android_library("chrome_java_test_pagecontroller") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
-    "//chrome/browser/ui/android/appmenu:test_support_java",
+    "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
     "//third_party/android_deps:com_android_support_drawerlayout_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -213,7 +213,7 @@ android_library("chrome_java_test_support") {
     "//chrome/browser/settings:test_support_java",
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/appmenu:java",
-    "//chrome/browser/ui/android/appmenu:test_support_java",
+    "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",