From 932039a010b69889bcd63e8e9a2e01ebc7803eb1 Mon Sep 17 00:00:00 2001
From: avynn <avynn@google.com>
Date: Thu, 1 Sep 2022 23:56:36 +0000
Subject: [PATCH] Saved Desks: Remove vestigial DeleteAllEntries from public
 API

This CL removes a vestigial DeleteAllEntries function from the
public API of the DeskSyncBridge.  This is done to maintain
a separation of concerns between the DeskSyncBridge and the
DeskModelWrapper.  The function itself is not completely removed
as the wrapper needs to access it in order to perform properly
however the function has been renamed to DeleteAllEntriesSync
to disambiguate its usage.

TESTED: DeskSyncBridgeTest.*,DeskModelWrapperTest.*
Bug: 1358677
Change-Id: Ib17b60bb89da8302ab74182114dbb0ea3ed99230
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3867389
Reviewed-by: Yanzhu Du <yzd@google.com>
Commit-Queue: Avynn Donaghe <avynn@google.com>
Cr-Commit-Position: refs/heads/main@{#1042371}
---
 components/desks_storage/core/desk_model_wrapper.cc | 2 +-
 components/desks_storage/core/desk_sync_bridge.cc   | 4 ++--
 components/desks_storage/core/desk_sync_bridge.h    | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/desks_storage/core/desk_model_wrapper.cc b/components/desks_storage/core/desk_model_wrapper.cc
index 87aa5aeaf7e7c3..86563ba0692662 100644
--- a/components/desks_storage/core/desk_model_wrapper.cc
+++ b/components/desks_storage/core/desk_model_wrapper.cc
@@ -90,7 +90,7 @@ void DeskModelWrapper::DeleteEntry(const base::GUID& uuid,
 void DeskModelWrapper::DeleteAllEntries(
     DeskModel::DeleteEntryCallback callback) {
   DeskModel::DeleteEntryStatus desk_template_delete_status =
-      GetDeskTemplateModel()->DeleteAllEntries();
+      GetDeskTemplateModel()->DeleteAllEntriesSync();
   if (desk_template_delete_status != DeskModel::DeleteEntryStatus::kOk) {
     std::move(callback).Run(desk_template_delete_status);
     return;
diff --git a/components/desks_storage/core/desk_sync_bridge.cc b/components/desks_storage/core/desk_sync_bridge.cc
index dc3700e6c9f045..e4801b4081dc76 100644
--- a/components/desks_storage/core/desk_sync_bridge.cc
+++ b/components/desks_storage/core/desk_sync_bridge.cc
@@ -1180,11 +1180,11 @@ void DeskSyncBridge::DeleteEntry(const base::GUID& uuid,
 }
 
 void DeskSyncBridge::DeleteAllEntries(DeleteEntryCallback callback) {
-  DeleteEntryStatus status = DeleteAllEntries();
+  DeleteEntryStatus status = DeleteAllEntriesSync();
   std::move(callback).Run(status);
 }
 
-DeskModel::DeleteEntryStatus DeskSyncBridge::DeleteAllEntries() {
+DeskModel::DeleteEntryStatus DeskSyncBridge::DeleteAllEntriesSync() {
   if (!IsReady()) {
     // This sync bridge has not finished initializing.
     // Cannot delete anything.
diff --git a/components/desks_storage/core/desk_sync_bridge.h b/components/desks_storage/core/desk_sync_bridge.h
index e83f2eeb9e4bf6..78fd8f5e568c10 100644
--- a/components/desks_storage/core/desk_sync_bridge.h
+++ b/components/desks_storage/core/desk_sync_bridge.h
@@ -102,12 +102,14 @@ class DeskSyncBridge : public syncer::ModelTypeSyncBridge, public DeskModel {
 
   const ash::DeskTemplate* GetUserEntryByUUID(const base::GUID& uuid) const;
 
-  DeskModel::DeleteEntryStatus DeleteAllEntries();
-
  private:
+  friend class DeskModelWrapper;
+
   using DeskEntries =
       base::flat_map<base::GUID, std::unique_ptr<ash::DeskTemplate>>;
 
+  DeskModel::DeleteEntryStatus DeleteAllEntriesSync();
+
   // Notify all observers that the model is loaded;
   void NotifyDeskModelLoaded();