Refactoring: Move the Android autofill code to provider dir

This should make the code structure more clear.

Bug: 1096235
Change-Id: Ie84293a0ffad11eb79301c638299e23aaa2522f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250704Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780410}

android_webview/BUILD.gn

@@ -530,7 +530,7 @@ android_library("browser_java") {
     "//base:base_java",
     "//base:jni_java",
     "//components/autofill/android:autofill_java",
-    "//components/autofill/android:provider_java",
+    "//components/autofill/android/provider:java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/content_capture/android:java",
     "//components/crash/android:handler_java",

android_webview/browser/BUILD.gn

@@ -196,7 +196,7 @@ source_set("browser") {
     "//android_webview/browser/metrics",
     "//android_webview/common",
     "//base",
-    "//components/autofill/android:provider",
+    "//components/autofill/android/provider",
     "//components/autofill/content/browser",
     "//components/cdm/browser",
     "//components/content_capture/android",

android_webview/browser/aw_contents.cc

@@ -61,7 +61,7 @@
 #include "base/supports_user_data.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/autofill/android/autofill_provider_android.h"
+#include "components/autofill/android/provider/autofill_provider_android.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"

android_webview/glue/BUILD.gn

@@ -18,7 +18,7 @@ android_library("glue_java") {
     "//base:base_java",
     "//base:jni_java",
     "//components/autofill/android:autofill_java",
-    "//components/autofill/android:provider_java",
+    "//components/autofill/android/provider:java",
     "//components/content_capture/android:java",
     "//components/embedder_support/android:application_java",
     "//content/public/android:content_java",

android_webview/test/BUILD.gn

@@ -171,7 +171,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/autofill/android:autofill_java",
-    "//components/autofill/android:provider_java",
+    "//components/autofill/android/provider:java",
     "//components/autofill/core/common/mojom:mojo_types_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/content_capture/android:java",

components/BUILD.gn

@@ -748,7 +748,7 @@ if (!is_ios && !is_fuchsia) {
 if (is_android) {
   junit_binary("components_junit_tests") {
     deps = [
-      "//components/autofill/android/junit:components_autofill_junit_tests",
+      "//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/media/android:junit",

components/autofill/android/BUILD.gn

@@ -55,50 +55,3 @@ android_library("autofill_java") {
   ]
   srcjar_deps = [ ":autofill_core_browser_java_enums" ]
 }
-
-android_library("provider_java") {
-  deps = [
-    ":autofill_java",
-    "//base:base_java",
-    "//base:jni_java",
-    "//components/autofill/core/common/mojom:mojo_types_java",
-    "//components/version_info/android:version_constants_java",
-    "//content/public/android:content_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//ui/android:ui_java",
-  ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  sources = [
-    "java/src/org/chromium/components/autofill/AutofillActionModeCallback.java",
-    "java/src/org/chromium/components/autofill/AutofillManagerWrapper.java",
-    "java/src/org/chromium/components/autofill/AutofillProvider.java",
-    "java/src/org/chromium/components/autofill/AutofillProviderUMA.java",
-    "java/src/org/chromium/components/autofill/FormData.java",
-    "java/src/org/chromium/components/autofill/FormFieldData.java",
-  ]
-}
-
-generate_jni("jni_headers") {
-  sources = [
-    "java/src/org/chromium/components/autofill/AutofillProvider.java",
-    "java/src/org/chromium/components/autofill/FormData.java",
-    "java/src/org/chromium/components/autofill/FormFieldData.java",
-  ]
-}
-
-static_library("provider") {
-  sources = [
-    "autofill_provider_android.cc",
-    "autofill_provider_android.h",
-    "form_data_android.cc",
-    "form_data_android.h",
-    "form_field_data_android.cc",
-    "form_field_data_android.h",
-  ]
-  deps = [
-    ":jni_headers",
-    "//components/autofill/core/browser:browser",
-    "//content/public/browser",
-    "//ui/android",
-  ]
-}

components/autofill/android/OWNERS

 file://ui/android/OWNERS
 
-# Files related to integration with system autofill
-per-file *autofill_provider*=michaelbai@chromium.org
-per-file *AutofillProvider*=michaelbai@chromium.org
-per-file *AutofillManagerWrapper*=michaelbai@chromium.org
-per-file *form*=michaelbai@chromium.org
-per-file *Form*=michaelbai@chromium.org

components/autofill/android/provider/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")
+import("//build/config/locales.gni")
+
+android_library("java") {
+  deps = [
+    "//base:base_java",
+    "//base:jni_java",
+    "//components/autofill/android:autofill_java",
+    "//components/autofill/core/common/mojom:mojo_types_java",
+    "//components/version_info/android:version_constants_java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//ui/android:ui_java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  sources = [
+    "java/src/org/chromium/components/autofill/AutofillActionModeCallback.java",
+    "java/src/org/chromium/components/autofill/AutofillManagerWrapper.java",
+    "java/src/org/chromium/components/autofill/AutofillProvider.java",
+    "java/src/org/chromium/components/autofill/AutofillProviderUMA.java",
+    "java/src/org/chromium/components/autofill/FormData.java",
+    "java/src/org/chromium/components/autofill/FormFieldData.java",
+  ]
+}
+
+generate_jni("jni_headers") {
+  sources = [
+    "java/src/org/chromium/components/autofill/AutofillProvider.java",
+    "java/src/org/chromium/components/autofill/FormData.java",
+    "java/src/org/chromium/components/autofill/FormFieldData.java",
+  ]
+}
+
+static_library("provider") {
+  sources = [
+    "autofill_provider_android.cc",
+    "autofill_provider_android.h",
+    "form_data_android.cc",
+    "form_data_android.h",
+    "form_field_data_android.cc",
+    "form_field_data_android.h",
+  ]
+  deps = [
+    ":jni_headers",
+    "//components/autofill/core/browser:browser",
+    "//content/public/browser",
+    "//ui/android",
+  ]
+}

components/autofill/android/autofill_provider_android.cc → components/autofill/android/provider/autofill_provider_android.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/android/autofill_provider_android.h"
+#include "components/autofill/android/provider/autofill_provider_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "components/autofill/android/form_data_android.h"
-#include "components/autofill/android/jni_headers/AutofillProvider_jni.h"
+#include "components/autofill/android/provider/form_data_android.h"
+#include "components/autofill/android/provider/jni_headers/AutofillProvider_jni.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_handler_proxy.h"
 #include "components/autofill/core/common/autofill_constants.h"

components/autofill/android/autofill_provider_android.h → components/autofill/android/provider/autofill_provider_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_ANDROID_AUTOFILL_PROVIDER_ANDROID_H_
-#define COMPONENTS_AUTOFILL_ANDROID_AUTOFILL_PROVIDER_ANDROID_H_
+#ifndef COMPONENTS_AUTOFILL_ANDROID_PROVIDER_AUTOFILL_PROVIDER_ANDROID_H_
+#define COMPONENTS_AUTOFILL_ANDROID_PROVIDER_AUTOFILL_PROVIDER_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/weak_ptr.h"
@@ -124,4 +124,4 @@ class AutofillProviderAndroid : public AutofillProvider {
 };
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_ANDROID_AUTOFILL_PROVIDER_ANDROID_H_
+#endif  // COMPONENTS_AUTOFILL_ANDROID_PROVIDER_AUTOFILL_PROVIDER_ANDROID_H_

components/autofill/android/form_data_android.cc → components/autofill/android/provider/form_data_android.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/android/form_data_android.h"
+#include "components/autofill/android/provider/form_data_android.h"
 
 #include "base/android/jni_string.h"
-#include "components/autofill/android/form_field_data_android.h"
-#include "components/autofill/android/jni_headers/FormData_jni.h"
+#include "components/autofill/android/provider/form_field_data_android.h"
+#include "components/autofill/android/provider/jni_headers/FormData_jni.h"
 #include "components/autofill/core/browser/form_structure.h"
 
 using base::android::AttachCurrentThread;

components/autofill/android/form_data_android.h → components/autofill/android/provider/form_data_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_ANDROID_FORM_DATA_ANDROID_H_
-#define COMPONENTS_AUTOFILL_ANDROID_FORM_DATA_ANDROID_H_
+#ifndef COMPONENTS_AUTOFILL_ANDROID_PROVIDER_FORM_DATA_ANDROID_H_
+#define COMPONENTS_AUTOFILL_ANDROID_PROVIDER_FORM_DATA_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
@@ -70,4 +70,4 @@ class FormDataAndroid {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_ANDROID_FORM_DATA_ANDROID_H_
+#endif  // COMPONENTS_AUTOFILL_ANDROID_PROVIDER_FORM_DATA_ANDROID_H_

components/autofill/android/form_field_data_android.cc → components/autofill/android/provider/form_field_data_android.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/autofill/android/form_field_data_android.h"
+#include "components/autofill/android/provider/form_field_data_android.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "components/autofill/android/jni_headers/FormFieldData_jni.h"
+#include "components/autofill/android/provider/jni_headers/FormFieldData_jni.h"
 #include "components/autofill/core/common/autofill_util.h"
 
 using base::android::AttachCurrentThread;

components/autofill/android/form_field_data_android.h → components/autofill/android/provider/form_field_data_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_AUTOFILL_ANDROID_FORM_FIELD_DATA_ANDROID_H_
-#define COMPONENTS_AUTOFILL_ANDROID_FORM_FIELD_DATA_ANDROID_H_
+#ifndef COMPONENTS_AUTOFILL_ANDROID_PROVIDER_FORM_FIELD_DATA_ANDROID_H_
+#define COMPONENTS_AUTOFILL_ANDROID_PROVIDER_FORM_FIELD_DATA_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
@@ -39,4 +39,4 @@ class FormFieldDataAndroid {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_ANDROID_FORM_FIELD_DATA_ANDROID_H_
+#endif  // COMPONENTS_AUTOFILL_ANDROID_PROVIDER_FORM_FIELD_DATA_ANDROID_H_

components/autofill/android/junit/BUILD.gn → components/autofill/android/provider/junit/BUILD.gn

@@ -13,7 +13,7 @@ java_library("components_autofill_junit_tests") {
   deps = [
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//components/autofill/android:provider_java",
+    "//components/autofill/android/provider:java",
     "//content/public/android:content_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",

weblayer/BUILD.gn

@@ -502,7 +502,7 @@ source_set("weblayer_lib_base") {
       "//android_webview:generate_aw_resources",
       "//android_webview:generate_aw_strings",
       "//components/android_system_error_page",
-      "//components/autofill/android:provider",
+      "//components/autofill/android/provider",
       "//components/browser_ui/site_settings/android",
       "//components/cdm/browser",
       "//components/content_settings/android",

weblayer/browser/java/BUILD.gn

@@ -150,7 +150,7 @@ android_library("java") {
     ":weblayer_resources",
     "//base:base_java",
     "//base:jni_java",
-    "//components/autofill/android:provider_java",
+    "//components/autofill/android/provider:java",
     "//components/browser_ui/http_auth/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/notifications/android:java",

weblayer/browser/tab_impl.cc

@@ -84,7 +84,7 @@
 #include "base/android/jni_string.h"
 #include "base/json/json_writer.h"
 #include "base/trace_event/trace_event.h"
-#include "components/autofill/android/autofill_provider_android.h"
+#include "components/autofill/android/provider/autofill_provider_android.h"
 #include "components/embedder_support/android/contextmenu/context_menu_builder.h"
 #include "components/embedder_support/android/delegate/color_chooser_android.h"
 #include "components/javascript_dialogs/tab_modal_dialog_manager.h"  // nogncheck