Reland v5 of Sessions Refactor

ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm

Index: ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
diff --git a/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm b/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
index df84d972776e0b59da8a02a901940af915744cc9..4e24de1ce3487c0e1e5eac62c884d98444845515 100644
--- a/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
+++ b/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
@@ -16,9 +16,9 @@ TabModelSyncedWindowDelegatesGetter::TabModelSyncedWindowDelegatesGetter() {}
 
 TabModelSyncedWindowDelegatesGetter::~TabModelSyncedWindowDelegatesGetter() {}
 
-std::set<const sync_sessions::SyncedWindowDelegate*>
+TabModelSyncedWindowDelegatesGetter::SyncedWindowDelegateMap
 TabModelSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
-  std::set<const sync_sessions::SyncedWindowDelegate*> synced_window_delegates;
+  SyncedWindowDelegateMap synced_window_delegates;
 
   std::vector<ios::ChromeBrowserState*> browser_states =
       GetApplicationContext()
@@ -31,7 +31,10 @@ TabModelSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
         GetTabModelsForChromeBrowserState(browser_state);
     for (TabModel* tabModel in tabModels) {
       if (tabModel.currentTab) {
-        synced_window_delegates.insert([tabModel syncedWindowDelegate]);
+        sync_sessions::SyncedWindowDelegate* synced_window_delegate =
+            [tabModel syncedWindowDelegate];
+        synced_window_delegates[synced_window_delegate->GetSessionId()] =
+            synced_window_delegate;
       }
     }
   }
@@ -41,9 +44,9 @@ TabModelSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
 
 const sync_sessions::SyncedWindowDelegate*
 TabModelSyncedWindowDelegatesGetter::FindById(SessionID::id_type session_id) {
-  for (const auto* delegate : GetSyncedWindowDelegates()) {
-    if (session_id == delegate->GetSessionId())
-      return delegate;
+  for (const auto& iter : GetSyncedWindowDelegates()) {
+    if (session_id == iter.second->GetSessionId())
+      return iter.second;
   }
   return nullptr;
 }