Reland: Move the files related to Android <-> Web credentials to a se…

…parate folder. Reland https://codereview.chromium.org/2949573002/ BUG=630555 TBR=engedy@chromium.org Review-Url: https://codereview.chromium.org/2949793002 Cr-Commit-Position: refs/heads/master@{#480867}
cbchan · Jun 20, 2017 · ff6656a · ff6656a
1 parent 576afe6
commit ff6656a
Show file tree

Hide file tree

Showing 55 changed files with 175 additions and 176 deletions.
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -15,7 +15,7 @@
 #include "chrome/common/extensions/api/passwords_private.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_contents.h"

diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc
@@ -15,7 +15,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/browser_sync/profile_sync_service.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"

diff --git a/chrome/browser/ui/passwords/password_manager_presenter.cc b/chrome/browser/ui/passwords/password_manager_presenter.cc
@@ -30,7 +30,7 @@
 #include "chrome/common/url_constants.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/browser_sync/profile_sync_service.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 #include "components/password_manager/core/browser/import/password_importer.h"
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"

diff --git a/components/password_manager/content/browser/credential_manager_impl.cc b/components/password_manager/content/browser/credential_manager_impl.cc
@@ -14,7 +14,7 @@
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/content/browser/content_password_manager_driver.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
-#include "components/password_manager/core/browser/affiliated_match_helper.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliated_match_helper.h"
 #include "components/password_manager/core/browser/credential_manager_logger.h"
 #include "components/password_manager/core/browser/form_fetcher_impl.h"
 #include "components/password_manager/core/browser/form_saver.h"

diff --git a/components/password_manager/content/browser/credential_manager_impl_unittest.cc b/components/password_manager/content/browser/credential_manager_impl_unittest.cc
@@ -22,8 +22,8 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "components/password_manager/core/browser/android_affiliation/mock_affiliated_match_helper.h"
 #include "components/password_manager/core/browser/credential_manager_password_form_manager.h"
-#include "components/password_manager/core/browser/mock_affiliated_match_helper.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/browser/stub_password_manager_driver.h"

diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
@@ -13,22 +13,26 @@ password_reuse_detection_support = !is_android && !is_ios
 
 static_library("browser") {
   sources = [
-    "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",
+    "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",
     "browser_save_password_progress_logger.cc",
     "browser_save_password_progress_logger.h",
     "credential_manager_logger.cc",
@@ -46,9 +50,6 @@ static_library("browser") {
     "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",
@@ -127,7 +128,6 @@ static_library("browser") {
     "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 @@ static_library("browser") {
 
 proto_library("proto") {
   sources = [
-    "affiliation_api.proto",
+    "android_affiliation/affiliation_api.proto",
   ]
 }
 
 static_library("test_support") {
   testonly = true
   sources = [
-    "fake_affiliation_api.cc",
-    "fake_affiliation_api.h",
-    "fake_affiliation_fetcher.cc",
-    "fake_affiliation_fetcher.h",
+    "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_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 @@ bundle_data("unit_tests_bundle_data") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "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",
+    "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",
     "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",

diff --git a/...r/core/browser/affiliated_match_helper.cc → ...id_affiliation/affiliated_match_helper.cc b/...r/core/browser/affiliated_match_helper.cc → ...id_affiliation/affiliated_match_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliated_match_helper.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliated_match_helper.h"
 
 #include <utility>
 
@@ -12,7 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/password_manager/core/browser/affiliation_service.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_service.h"
 
 namespace password_manager {
 

diff --git a/...er/core/browser/affiliated_match_helper.h → ...oid_affiliation/affiliated_match_helper.h b/...er/core/browser/affiliated_match_helper.h → ...oid_affiliation/affiliated_match_helper.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_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATED_MATCH_HELPER_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATED_MATCH_HELPER_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATED_MATCH_HELPER_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATED_MATCH_HELPER_H_
 
 #include <memory>
 #include <string>
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 
@@ -157,4 +157,4 @@ class AffiliatedMatchHelper : public PasswordStore::Observer,
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATED_MATCH_HELPER_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATED_MATCH_HELPER_H_
diff --git a/...owser/affiliated_match_helper_unittest.cc → ...ation/affiliated_match_helper_unittest.cc b/...owser/affiliated_match_helper_unittest.cc → ...ation/affiliated_match_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliated_match_helper.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliated_match_helper.h"
 
 #include <stddef.h>
 
@@ -17,8 +17,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_mock_time_message_loop_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/password_manager/core/browser/affiliation_service.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_service.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 #include "components/password_manager/core/browser/test_password_store.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/...anager/core/browser/affiliation_api.proto → ...android_affiliation/affiliation_api.proto b/...anager/core/browser/affiliation_api.proto → ...android_affiliation/affiliation_api.proto
diff --git a/...nager/core/browser/affiliation_backend.cc → ...ndroid_affiliation/affiliation_backend.cc b/...nager/core/browser/affiliation_backend.cc → ...ndroid_affiliation/affiliation_backend.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliation_backend.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_backend.h"
 
 #include <stdint.h>
 #include <algorithm>
@@ -17,10 +17,10 @@
 #include "base/time/clock.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
-#include "components/password_manager/core/browser/affiliation_database.h"
-#include "components/password_manager/core/browser/affiliation_fetch_throttler.h"
-#include "components/password_manager/core/browser/affiliation_fetcher.h"
-#include "components/password_manager/core/browser/facet_manager.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_database.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetcher.h"
+#include "components/password_manager/core/browser/android_affiliation/facet_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace password_manager {

diff --git a/...anager/core/browser/affiliation_backend.h → ...android_affiliation/affiliation_backend.h b/...anager/core/browser/affiliation_backend.h → ...android_affiliation/affiliation_backend.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_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_BACKEND_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_BACKEND_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_BACKEND_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_BACKEND_H_
 
 #include <stddef.h>
 
@@ -15,11 +15,11 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "components/password_manager/core/browser/affiliation_fetch_throttler_delegate.h"
-#include "components/password_manager/core/browser/affiliation_fetcher_delegate.h"
-#include "components/password_manager/core/browser/affiliation_service.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
-#include "components/password_manager/core/browser/facet_manager_host.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_delegate.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetcher_delegate.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_service.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/facet_manager_host.h"
 
 namespace base {
 class Clock;
@@ -164,4 +164,4 @@ class AffiliationBackend : public FacetManagerHost,
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_BACKEND_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_BACKEND_H_
diff --git a/...e/browser/affiliation_backend_unittest.cc → ...filiation/affiliation_backend_unittest.cc b/...e/browser/affiliation_backend_unittest.cc → ...filiation/affiliation_backend_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliation_backend.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_backend.h"
 
 #include <stddef.h>
 
@@ -17,12 +17,12 @@
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/clock.h"
 #include "base/time/tick_clock.h"
-#include "components/password_manager/core/browser/affiliation_database.h"
-#include "components/password_manager/core/browser/affiliation_fetch_throttler.h"
-#include "components/password_manager/core/browser/affiliation_fetch_throttler_delegate.h"
-#include "components/password_manager/core/browser/facet_manager.h"
-#include "components/password_manager/core/browser/fake_affiliation_api.h"
-#include "components/password_manager/core/browser/mock_affiliation_consumer.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_database.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_delegate.h"
+#include "components/password_manager/core/browser/android_affiliation/facet_manager.h"
+#include "components/password_manager/core/browser/android_affiliation/fake_affiliation_api.h"
+#include "components/password_manager/core/browser/android_affiliation/mock_affiliation_consumer.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/...ager/core/browser/affiliation_database.cc → ...droid_affiliation/affiliation_database.cc b/...ager/core/browser/affiliation_database.cc → ...droid_affiliation/affiliation_database.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliation_database.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_database.h"
 
 #include <stdint.h>
 

diff --git a/...nager/core/browser/affiliation_database.h → ...ndroid_affiliation/affiliation_database.h b/...nager/core/browser/affiliation_database.h → ...ndroid_affiliation/affiliation_database.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_DATABASE_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_DATABASE_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_DATABASE_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_DATABASE_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "components/password_manager/core/browser/affiliation_utils.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
 
 namespace base {
 class FilePath;
@@ -90,4 +90,4 @@ class AffiliationDatabase {
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_DATABASE_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_DATABASE_H_
diff --git a/.../browser/affiliation_database_unittest.cc → ...iliation/affiliation_database_unittest.cc b/.../browser/affiliation_database_unittest.cc → ...iliation/affiliation_database_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliation_database.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_database.h"
 
 #include <stdint.h>
 

diff --git a/...re/browser/affiliation_fetch_throttler.cc → ...ffiliation/affiliation_fetch_throttler.cc b/...re/browser/affiliation_fetch_throttler.cc → ...ffiliation/affiliation_fetch_throttler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/password_manager/core/browser/affiliation_fetch_throttler.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.h"
 
 #include <stdint.h>
 
@@ -11,7 +11,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
-#include "components/password_manager/core/browser/affiliation_fetch_throttler_delegate.h"
+#include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_delegate.h"
 
 namespace password_manager {
 

diff --git a/...ore/browser/affiliation_fetch_throttler.h → ...affiliation/affiliation_fetch_throttler.h b/...ore/browser/affiliation_fetch_throttler.h → ...affiliation/affiliation_fetch_throttler.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_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_FETCH_THROTTLER_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_FETCH_THROTTLER_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_FETCH_THROTTLER_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_FETCH_THROTTLER_H_
 
 #include <stdint.h>
 
@@ -132,4 +132,4 @@ class AffiliationFetchThrottler
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_AFFILIATION_FETCH_THROTTLER_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_ANDROID_AFFILIATION_AFFILIATION_FETCH_THROTTLER_H_