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

components/password_manager/core/browser/BUILD.gn

 # Copyright 2014 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("//third_party/protobuf/proto_library.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
 # TODO(crbug.com/706392): Fix password reuse detection for Android.
 password_reuse_detection_support = !is_android && !is_ios
 
 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",
     "credential_manager_logger.h",
     "credential_manager_password_form_manager.cc",
     "credential_manager_password_form_manager.h",
     "credential_manager_pending_prevent_silent_access_task.cc",
     "credential_manager_pending_prevent_silent_access_task.h",
     "credential_manager_pending_request_task.cc",
     "credential_manager_pending_request_task.h",
     "credentials_filter.h",
     "export/csv_writer.cc",
     "export/csv_writer.h",
     "export/password_csv_writer.cc",
     "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",
     "form_saver.h",
     "form_saver_impl.cc",
     "form_saver_impl.h",
     "http_password_store_migrator.cc",
     "http_password_store_migrator.h",
     "import/csv_reader.cc",
     "import/csv_reader.h",
@@ skipping 57 matching lines @@
     "psl_matching_helper.cc",
     "psl_matching_helper.h",
     "site_affiliation/asset_link_retriever.cc",
     "site_affiliation/asset_link_retriever.h",
     "sql_table_builder.cc",
     "sql_table_builder.h",
     "statistics_table.cc",
     "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",
     "webdata/password_web_data_service_win.cc",
     "webdata/password_web_data_service_win.h",
   ]
 
   if (password_reuse_detection_support) {
     sources += [
       "hash_password_manager.cc",
@@ skipping 52 matching lines @@
   if (is_mac || is_ios) {
     sources -= [ "login_database_posix.cc" ]
   }
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
 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",
     "password_manager_test_utils.h",
     "stub_credentials_filter.cc",
     "stub_credentials_filter.h",
     "stub_form_saver.h",
     "stub_log_manager.cc",
     "stub_log_manager.h",
     "stub_password_manager_client.cc",
@@ skipping 47 matching lines @@
   ]
   outputs = [
     "{{bundle_resources_dir}}/" +
         "{{source_root_relative_dir}}/{{source_file_part}}",
   ]
 }
 
 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",
     "import/csv_reader_unittest.cc",
     "import/password_csv_reader_unittest.cc",
     "import/password_importer_unittest.cc",
     "log_manager_unittest.cc",
     "log_router_unittest.cc",
     "login_database_unittest.cc",
     "login_model_unittest.cc",
@@ skipping 50 matching lines @@
     "//components/sync:test_support_model",
     "//components/variations",
     "//net:test_support",
     "//sql:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/base",
     "//url",
   ]
 }