Update BottomSheet's directory structure

This patch aligns the directory structure of the bottom sheet widget
with others in the browser_ui component. Specificialy, instead of the
"android/name" pattern, the sheet now uses "name/android".

Bug: 1169164
Change-Id: I74cf28bd59022624610758c41342f217dbac8ec7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643023Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Benoit L <lizeb@chromium.org>
Auto-Submit: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Benoit L <lizeb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846115}

chrome/android/BUILD.gn

@@ -205,7 +205,7 @@ android_resources("chrome_app_java_resources") {
     "//chrome/browser/ui/messages/android:java_resources",
     "//components/autofill/android:autofill_java_resources",
     "//components/blocked_content/android:java_resources",
-    "//components/browser_ui/android/bottomsheet:java_resources",
+    "//components/browser_ui/bottomsheet/android:java_resources",
     "//components/browser_ui/contacts_picker/android:java_resources",
     "//components/browser_ui/http_auth/android:java_resources",
     "//components/browser_ui/modaldialog/android:java_resources",
@@ -369,10 +369,10 @@ android_library("chrome_java") {
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/bookmarks/common/android:bookmarks_java",
-    "//components/browser_ui/android/bottomsheet:factory_java",
-    "//components/browser_ui/android/bottomsheet:java",
-    "//components/browser_ui/android/bottomsheet:manager_java",
     "//components/browser_ui/banners/android:java",
+    "//components/browser_ui/bottomsheet/android:factory_java",
+    "//components/browser_ui/bottomsheet/android:java",
+    "//components/browser_ui/bottomsheet/android:manager_java",
     "//components/browser_ui/client_certificate/android:java",
     "//components/browser_ui/contacts_picker/android:java",
     "//components/browser_ui/display_cutout/android:java",
@@ -650,7 +650,7 @@ java_group("chrome_all_java") {
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/browser/ui/android/appmenu/internal:java",
     "//chrome/browser/video_tutorials/internal:java",
-    "//components/browser_ui/android/bottomsheet/internal:java",
+    "//components/browser_ui/bottomsheet/android/internal:java",
     "//components/messages/android/internal:java",
   ]
 
@@ -877,7 +877,7 @@ junit_binary("chrome_junit_tests") {
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/bookmarks/common/android:bookmarks_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/display_cutout/android:java",
     "//components/browser_ui/media/android:java",
     "//components/browser_ui/notifications/android:java",
@@ -1137,8 +1137,8 @@ android_library("chrome_test_java") {
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/background_task_scheduler/internal:background_task_scheduler_javatests",
     "//components/bookmarks/common/android:bookmarks_java",
-    "//components/browser_ui/android/bottomsheet:java",
-    "//components/browser_ui/android/bottomsheet/test:java",
+    "//components/browser_ui/bottomsheet/android:java",
+    "//components/browser_ui/bottomsheet/android/test:java",
     "//components/browser_ui/contacts_picker/android:javatests",
     "//components/browser_ui/display_cutout/android:java",
     "//components/browser_ui/media/android:java",

chrome/android/DEPS

@@ -32,8 +32,8 @@ include_rules = [
   "+chrome/browser/video_tutorials",
   "+chrome/browser/webapps/android",
   "+chrome/browser/webauthn/android",
-  "+components/browser_ui/android/bottomsheet",
   "+components/browser_ui/banners/android",
+  "+components/browser_ui/bottomsheet/android",
   "+components/browser_ui/contacts_picker/android",
   "+components/browser_ui/display_cutout/android",
   "+components/browser_ui/media/android",

chrome/android/expectations/lint-baseline.xml

@@ -1547,7 +1547,7 @@
         errorLine1="    public boolean onTouchEvent(MotionEvent e) {"
         errorLine2="                   ~~~~~~~~~~~~">
         <location
-            file="../../components/browser_ui/android/bottomsheet/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheet.java"
+            file="../../components/browser_ui/bottomsheet/android/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheet.java"
             line="278"
             column="20"/>
     </issue>
@@ -1844,7 +1844,7 @@
         errorLine1="    public boolean onTouchEvent(MotionEvent event) {"
         errorLine2="                   ~~~~~~~~~~~~">
         <location
-            file="../../components/browser_ui/android/bottomsheet/internal/java/src/org/chromium/components/browser_ui/bottomsheet/TouchRestrictingFrameLayout.java"
+            file="../../components/browser_ui/bottomsheet/android/internal/java/src/org/chromium/components/browser_ui/bottomsheet/TouchRestrictingFrameLayout.java"
             line="46"
             column="20"/>
     </issue>

chrome/android/features/autofill_assistant/BUILD.gn

@@ -49,7 +49,7 @@ android_library("java") {
     "//chrome/browser/util:java",
     "//chrome/browser/version:java",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
@@ -328,7 +328,7 @@ android_library("test_java") {
     "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -70,7 +70,7 @@ android_library("test_java") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
     "//components/autofill/core/common/mojom:mojo_types_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/browser_ui/widget/android:test_support_java",
@@ -122,7 +122,7 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//chrome/browser/tabmodel:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:util_java",
     "//components/feature_engagement/public:public_java",

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -25,7 +25,7 @@ android_library("internal_java") {
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",

chrome/android/features/keyboard_accessory/public/BUILD.gn

@@ -8,7 +8,7 @@ android_library("public_java") {
   deps = [
     "//base:base_java",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
   ]

chrome/android/features/start_surface/internal/BUILD.gn

@@ -82,7 +82,7 @@ android_library("java") {
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/browser/version:java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/prefs/android:java",
     "//components/user_prefs/android:java",

chrome/android/features/tab_ui/BUILD.gn

@@ -214,7 +214,7 @@ android_library("java") {
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/share/android:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",

chrome/browser/banners/android/BUILD.gn

@@ -66,7 +66,7 @@ android_library("javatests") {
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/browser/webapps/android:java",
     "//chrome/test/android:chrome_java_test_support",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/feature_engagement/public:public_java",
     "//components/infobars/android:java",
     "//components/signin/core/browser/android:java",

chrome/browser/banners/android/DEPS

 include_rules = [
-  "+components/browser_ui/android/bottomsheet/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetController.java",
+  "+components/browser_ui/bottomsheet/android/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetController.java",
   "+components/infobars/android/java/src/org/chromium/components/infobars/InfoBar.java",
   "+components/infobars/android/java/src/org/chromium/components/infobars/InfoBarAnimationListener.java",
   "+components/infobars/android/java/src/org/chromium/components/infobars/InfoBarUiItem.java",

chrome/browser/share/DEPS

@@ -13,9 +13,9 @@ include_rules = [
   "+chrome/android/java/src/org/chromium/chrome/browser/notifications",
   "+chrome/android/java/src/org/chromium/chrome/browser/share",
   "+chrome/services/qrcode_generator",
+  "+components/browser_ui/bottomsheet/android",
   "+components/browser_ui/notifications/android",
   "+components/browser_ui/share/android",
-  "+components/browser_ui/android/bottomsheet",
   "+components/favicon/android",
   "+components/infobars/android",
   "+components/shared_highlighting/core/common",

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

@@ -16,7 +16,7 @@ android_library("java") {
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/signin/services/android:java",
     "//chrome/browser/tabmodel:java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",

chrome/browser/signin/ui/android/DEPS

 include_rules = [
-  "+components/browser_ui/android/bottomsheet",
+  "+components/browser_ui/bottomsheet/android",
 ]

chrome/browser/touch_to_fill/DEPS

 include_rules = [
   "+chrome/android",
   "+chrome/browser/ui/android/favicon/java",
-  "+components/browser_ui/android/bottomsheet",
+  "+components/browser_ui/bottomsheet/android",
   "+components/favicon/android",
 ]

chrome/browser/touch_to_fill/android/BUILD.gn

@@ -28,7 +28,7 @@ generate_jni("jni_headers") {
 android_library("public_java") {
   deps = [
     "//base:base_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
   ]
@@ -55,7 +55,7 @@ junit_binary("touch_to_fill_junit_tests") {
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/test/android:chrome_java_test_support",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/favicon/android:java",
     "//components/module_installer/android:module_installer_java",
     "//components/url_formatter/android:url_formatter_java",
@@ -85,8 +85,8 @@ android_library("test_java") {
     "//chrome/browser/flags:java",
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/test/android:chrome_java_test_support",
-    "//components/browser_ui/android/bottomsheet:java",
-    "//components/browser_ui/android/bottomsheet/test:java",
+    "//components/browser_ui/bottomsheet/android:java",
+    "//components/browser_ui/bottomsheet/android/test:java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_test_runner_java",

chrome/browser/touch_to_fill/android/internal/BUILD.gn

@@ -18,7 +18,7 @@ android_library("java") {
     "//chrome/browser/touch_to_fill/android:public_java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/util:java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/embedder_support/android:util_java",
     "//components/favicon/android:java",
     "//components/url_formatter/android:url_formatter_java",

chrome/browser/webapps/android/BUILD.gn

@@ -44,7 +44,7 @@ android_library("java") {
     ":jni_headers",
     "//base:base_java",
     "//base:jni_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//content/public/android:content_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",

chrome/browser/webapps/android/DEPS

 # External directories and/or files that can be included from this module:
 include_rules = [
-  "+components/browser_ui/android/bottomsheet",
+  "+components/browser_ui/bottomsheet/android",
   "+content/public/android/java/src/org/chromium/content_public/browser",
 ]

chrome/test/android/DEPS

 include_rules = [
   "+components/autofill/android/java/src/org/chromium/components/autofill",
-  "+components/browser_ui/android/bottomsheet",
+  "+components/browser_ui/bottomsheet/android",
   "+components/browser_ui/styles/android/java",
   "+components/browser_ui/widget/android",
   "+components/embedder_support/android/java",

components/BUILD.gn

@@ -803,7 +803,7 @@ if (is_android) {
     deps = [
       "//components/autofill/android/provider/junit:components_autofill_junit_tests",
       "//components/background_task_scheduler:components_background_task_scheduler_junit_tests",
-      "//components/browser_ui/android/bottomsheet/internal:junit_tests",
+      "//components/browser_ui/bottomsheet/android/internal:junit_tests",
       "//components/browser_ui/client_certificate/android:junit",
       "//components/browser_ui/media/android:junit",
       "//components/browser_ui/photo_picker/android:junit",