Revert of Reland: Move the files related to Android <-> Web credentials to a separate folder.

components/password_manager/core/browser/BUILD.gn

Index: components/password_manager/core/browser/BUILD.gn
diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
index 9dbc03db5cb39d9b7dcd1aeb3e5b8af49e86fdb7..ac47b07b58eb78bddff3350ae619e66be92e02b0 100644
--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
@@ -13,26 +13,22 @@
 
 static_library("browser") {
   sources = [
-    "android_affiliation/affiliated_match_helper.cc",
-    "android_affiliation/affiliated_match_helper.h",
-    "android_affiliation/affiliation_backend.cc",
-    "android_affiliation/affiliation_backend.h",
-    "android_affiliation/affiliation_database.cc",
-    "android_affiliation/affiliation_database.h",
-    "android_affiliation/affiliation_fetch_throttler.cc",
-    "android_affiliation/affiliation_fetch_throttler.h",
-    "android_affiliation/affiliation_fetch_throttler_delegate.h",
-    "android_affiliation/affiliation_fetcher.cc",
-    "android_affiliation/affiliation_fetcher.h",
-    "android_affiliation/affiliation_fetcher_delegate.h",
-    "android_affiliation/affiliation_service.cc",
-    "android_affiliation/affiliation_service.h",
-    "android_affiliation/affiliation_utils.cc",
-    "android_affiliation/affiliation_utils.h",
-    "android_affiliation/facet_manager.cc",
-    "android_affiliation/facet_manager.h",
-    "android_affiliation/facet_manager_host.h",
-    "android_affiliation/test_affiliation_fetcher_factory.h",
+    "affiliated_match_helper.cc",
+    "affiliated_match_helper.h",
+    "affiliation_backend.cc",
+    "affiliation_backend.h",
+    "affiliation_database.cc",
+    "affiliation_database.h",
+    "affiliation_fetch_throttler.cc",
+    "affiliation_fetch_throttler.h",
+    "affiliation_fetch_throttler_delegate.h",
+    "affiliation_fetcher.cc",
+    "affiliation_fetcher.h",
+    "affiliation_fetcher_delegate.h",
+    "affiliation_service.cc",
+    "affiliation_service.h",
+    "affiliation_utils.cc",
+    "affiliation_utils.h",
     "browser_save_password_progress_logger.cc",
     "browser_save_password_progress_logger.h",
     "credential_manager_logger.cc",
@@ -50,6 +46,9 @@
     "export/password_csv_writer.h",
     "export/password_exporter.cc",
     "export/password_exporter.h",
+    "facet_manager.cc",
+    "facet_manager.h",
+    "facet_manager_host.h",
     "form_fetcher.h",
     "form_fetcher_impl.cc",
     "form_fetcher_impl.h",
@@ -128,6 +127,7 @@
     "statistics_table.h",
     "suppressed_form_fetcher.cc",
     "suppressed_form_fetcher.h",
+    "test_affiliation_fetcher_factory.h",
     "webdata/logins_table.cc",
     "webdata/logins_table.h",
     "webdata/logins_table_win.cc",
@@ -200,23 +200,23 @@
 
 proto_library("proto") {
   sources = [
-    "android_affiliation/affiliation_api.proto",
+    "affiliation_api.proto",
   ]
 }
 
 static_library("test_support") {
   testonly = true
   sources = [
-    "android_affiliation/fake_affiliation_api.cc",
-    "android_affiliation/fake_affiliation_api.h",
-    "android_affiliation/fake_affiliation_fetcher.cc",
-    "android_affiliation/fake_affiliation_fetcher.h",
-    "android_affiliation/mock_affiliated_match_helper.cc",
-    "android_affiliation/mock_affiliated_match_helper.h",
-    "android_affiliation/mock_affiliation_consumer.cc",
-    "android_affiliation/mock_affiliation_consumer.h",
+    "fake_affiliation_api.cc",
+    "fake_affiliation_api.h",
+    "fake_affiliation_fetcher.cc",
+    "fake_affiliation_fetcher.h",
     "fake_form_fetcher.cc",
     "fake_form_fetcher.h",
+    "mock_affiliated_match_helper.cc",
+    "mock_affiliated_match_helper.h",
+    "mock_affiliation_consumer.cc",
+    "mock_affiliation_consumer.h",
     "mock_password_store.cc",
     "mock_password_store.h",
     "password_manager_test_utils.cc",
@@ -284,20 +284,20 @@
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "android_affiliation/affiliated_match_helper_unittest.cc",
-    "android_affiliation/affiliation_backend_unittest.cc",
-    "android_affiliation/affiliation_database_unittest.cc",
-    "android_affiliation/affiliation_fetch_throttler_unittest.cc",
-    "android_affiliation/affiliation_fetcher_unittest.cc",
-    "android_affiliation/affiliation_service_unittest.cc",
-    "android_affiliation/affiliation_utils_unittest.cc",
-    "android_affiliation/facet_manager_unittest.cc",
+    "affiliated_match_helper_unittest.cc",
+    "affiliation_backend_unittest.cc",
+    "affiliation_database_unittest.cc",
+    "affiliation_fetch_throttler_unittest.cc",
+    "affiliation_fetcher_unittest.cc",
+    "affiliation_service_unittest.cc",
+    "affiliation_utils_unittest.cc",
     "browser_save_password_progress_logger_unittest.cc",
     "credential_manager_logger_unittest.cc",
     "credential_manager_password_form_manager_unittest.cc",
     "export/csv_writer_unittest.cc",
     "export/password_csv_writer_unittest.cc",
     "export/password_exporter_unittest.cc",
+    "facet_manager_unittest.cc",
     "form_fetcher_impl_unittest.cc",
     "form_saver_impl_unittest.cc",
     "http_password_store_migrator_unittest.cc",