[Sync::USS] Rename PasswordModelTypeController class

This CL renames PasswordModelTypeController class.
Currently it is used for the Pseudo USS implementation as an intermediate
stage till releasing the full-blown USS implementation for passwords.

We should reserve that name for the full-blown implementation.

Bug: 902349
Change-Id: I01b9df1e9e4afcb0307f58a95172769a9f249f18
Reviewed-on: https://chromium-review.googlesource.com/c/1320170Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606001}

components/browser_sync/profile_sync_components_factory_impl.cc

@@ -25,8 +25,8 @@
 #include "components/history/core/browser/sync/history_delete_directives_model_type_controller.h"
 #include "components/history/core/browser/sync/typed_url_model_type_controller.h"
 #include "components/password_manager/core/browser/password_data_type_controller.h"
-#include "components/password_manager/core/browser/password_model_type_controller.h"
 #include "components/password_manager/core/browser/password_store.h"
+#include "components/password_manager/core/browser/password_syncable_service_based_model_type_controller.h"
 #include "components/prefs/pref_service.h"
 #include "components/reading_list/features/reading_list_switches.h"
 #include "components/sync/base/report_unrecoverable_error.h"
@@ -321,7 +321,8 @@ ProfileSyncComponentsFactoryImpl::CreateCommonDataTypeControllers(
   if (!disabled_types.Has(syncer::PASSWORDS)) {
     if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSPasswords)) {
       controllers.push_back(
-          std::make_unique<password_manager::PasswordModelTypeController>(
+          std::make_unique<password_manager::
+                               PasswordSyncableServiceBasedModelTypeController>(
               sync_client_->GetModelTypeStoreService()->GetStoreFactory(),
               dump_stack, password_store_, sync_client_));
     } else {

components/password_manager/core/browser/BUILD.gn

@@ -134,8 +134,6 @@ jumbo_static_library("browser") {
     "password_manager_metrics_util.h",
     "password_manager_util.cc",
     "password_manager_util.h",
-    "password_model_type_controller.cc",
-    "password_model_type_controller.h",
     "password_model_worker.cc",
     "password_model_worker.h",
     "password_requirements_service.cc",
@@ -156,6 +154,8 @@ jumbo_static_library("browser") {
     "password_sync_util.h",
     "password_syncable_service.cc",
     "password_syncable_service.h",
+    "password_syncable_service_based_model_type_controller.cc",
+    "password_syncable_service_based_model_type_controller.h",
     "password_ui_utils.cc",
     "password_ui_utils.h",
     "psl_matching_helper.cc",

components/password_manager/core/browser/password_model_type_controller.cc → components/password_manager/core/browser/password_syncable_service_based_model_type_controller.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/password_model_type_controller.h"
+#include "components/password_manager/core/browser/password_syncable_service_based_model_type_controller.h"
 
 #include <string>
 #include <utility>
@@ -81,7 +81,7 @@ class OnCryptographerStateChangedProxy
 
 // Created and constructed on any thread, but otherwise used exclusively on a
 // single sequence (the model sequence).
-class PasswordModelTypeController::ModelCryptographerImpl
+class PasswordSyncableServiceBasedModelTypeController::ModelCryptographerImpl
     : public syncer::SyncableServiceBasedBridge::ModelCryptographer {
  public:
   ModelCryptographerImpl() { DETACH_FROM_SEQUENCE(sequence_checker_); }
@@ -156,21 +156,23 @@ class PasswordModelTypeController::ModelCryptographerImpl
   std::unique_ptr<syncer::Cryptographer> cryptographer_;
 };
 
-PasswordModelTypeController::PasswordModelTypeController(
-    syncer::OnceModelTypeStoreFactory store_factory,
-    const base::RepeatingClosure& dump_stack,
-    scoped_refptr<PasswordStore> password_store,
-    syncer::SyncClient* sync_client)
-    : PasswordModelTypeController(
+PasswordSyncableServiceBasedModelTypeController::
+    PasswordSyncableServiceBasedModelTypeController(
+        syncer::OnceModelTypeStoreFactory store_factory,
+        const base::RepeatingClosure& dump_stack,
+        scoped_refptr<PasswordStore> password_store,
+        syncer::SyncClient* sync_client)
+    : PasswordSyncableServiceBasedModelTypeController(
           std::move(store_factory),
           dump_stack,
           std::move(password_store),
           sync_client,
           base::MakeRefCounted<ModelCryptographerImpl>()) {}
 
-PasswordModelTypeController::~PasswordModelTypeController() = default;
+PasswordSyncableServiceBasedModelTypeController::
+    ~PasswordSyncableServiceBasedModelTypeController() = default;
 
-void PasswordModelTypeController::LoadModels(
+void PasswordSyncableServiceBasedModelTypeController::LoadModels(
     const syncer::ConfigureContext& configure_context,
     const ModelLoadCallback& model_load_callback) {
   DCHECK(CalledOnValidThread());
@@ -180,8 +182,9 @@ void PasswordModelTypeController::LoadModels(
   sync_client_->GetPasswordStateChangedCallback().Run();
 }
 
-void PasswordModelTypeController::Stop(syncer::ShutdownReason shutdown_reason,
-                                       StopCallback callback) {
+void PasswordSyncableServiceBasedModelTypeController::Stop(
+    syncer::ShutdownReason shutdown_reason,
+    StopCallback callback) {
   DCHECK(CalledOnValidThread());
   sync_client_->GetSyncService()->RemoveObserver(this);
   NonUiSyncableServiceBasedModelTypeController::Stop(shutdown_reason,
@@ -190,7 +193,7 @@ void PasswordModelTypeController::Stop(syncer::ShutdownReason shutdown_reason,
 }
 
 std::unique_ptr<syncer::SyncEncryptionHandler::Observer>
-PasswordModelTypeController::GetEncryptionObserverProxy() {
+PasswordSyncableServiceBasedModelTypeController::GetEncryptionObserverProxy() {
   DCHECK(CalledOnValidThread());
   return std::make_unique<OnCryptographerStateChangedProxy>(
       background_task_runner_,
@@ -198,17 +201,19 @@ PasswordModelTypeController::GetEncryptionObserverProxy() {
                           model_cryptographer_));
 }
 
-void PasswordModelTypeController::OnStateChanged(syncer::SyncService* sync) {
+void PasswordSyncableServiceBasedModelTypeController::OnStateChanged(
+    syncer::SyncService* sync) {
   DCHECK(CalledOnValidThread());
   sync_client_->GetPasswordStateChangedCallback().Run();
 }
 
-PasswordModelTypeController::PasswordModelTypeController(
-    syncer::OnceModelTypeStoreFactory store_factory,
-    const base::RepeatingClosure& dump_stack,
-    scoped_refptr<PasswordStore> password_store,
-    syncer::SyncClient* sync_client,
-    scoped_refptr<ModelCryptographerImpl> model_cryptographer)
+PasswordSyncableServiceBasedModelTypeController::
+    PasswordSyncableServiceBasedModelTypeController(
+        syncer::OnceModelTypeStoreFactory store_factory,
+        const base::RepeatingClosure& dump_stack,
+        scoped_refptr<PasswordStore> password_store,
+        syncer::SyncClient* sync_client,
+        scoped_refptr<ModelCryptographerImpl> model_cryptographer)
     : NonUiSyncableServiceBasedModelTypeController(
           syncer::PASSWORDS,
           std::move(store_factory),

components/password_manager/core/browser/password_model_type_controller.h → components/password_manager/core/browser/password_syncable_service_based_model_type_controller.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_PASSWORD_MODEL_TYPE_CONTROLLER_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MODEL_TYPE_CONTROLLER_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_BASED_MODEL_TYPE_CONTROLLER_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_BASED_MODEL_TYPE_CONTROLLER_H_
 
 #include <memory>
 
@@ -21,7 +21,7 @@ namespace password_manager {
 class PasswordStore;
 
 // A class that manages the startup and shutdown of password sync.
-class PasswordModelTypeController
+class PasswordSyncableServiceBasedModelTypeController
     : public syncer::NonUiSyncableServiceBasedModelTypeController,
       public syncer::SyncServiceObserver {
  public:
@@ -29,11 +29,12 @@ class PasswordModelTypeController
   // copy of sync's data and metadata, sync-ed with |password_store|.
   // |dump_stack| is called when a unrecoverable error occurs. |sync_client|
   // must not be null.
-  PasswordModelTypeController(syncer::OnceModelTypeStoreFactory store_factory,
-                              const base::RepeatingClosure& dump_stack,
-                              scoped_refptr<PasswordStore> password_store,
-                              syncer::SyncClient* sync_client);
-  ~PasswordModelTypeController() override;
+  PasswordSyncableServiceBasedModelTypeController(
+      syncer::OnceModelTypeStoreFactory store_factory,
+      const base::RepeatingClosure& dump_stack,
+      scoped_refptr<PasswordStore> password_store,
+      syncer::SyncClient* sync_client);
+  ~PasswordSyncableServiceBasedModelTypeController() override;
 
   // DataTypeController overrides.
   void LoadModels(const syncer::ConfigureContext& configure_context,
@@ -51,7 +52,7 @@ class PasswordModelTypeController
 
   // Constructor overload to make sure |ModelCryptographerImpl| gets constructed
   // before the base class.
-  PasswordModelTypeController(
+  PasswordSyncableServiceBasedModelTypeController(
       syncer::OnceModelTypeStoreFactory store_factory,
       const base::RepeatingClosure& dump_stack,
       scoped_refptr<PasswordStore> password_store,
@@ -62,9 +63,9 @@ class PasswordModelTypeController
   const scoped_refptr<ModelCryptographerImpl> model_cryptographer_;
   syncer::SyncClient* const sync_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(PasswordModelTypeController);
+  DISALLOW_COPY_AND_ASSIGN(PasswordSyncableServiceBasedModelTypeController);
 };
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MODEL_TYPE_CONTROLLER_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_BASED_MODEL_TYPE_CONTROLLER_H_