Reland v5 of Sessions Refactor

chrome/browser/ui/sync/browser_synced_window_delegates_getter.cc

Index: chrome/browser/ui/sync/browser_synced_window_delegates_getter.cc
diff --git a/chrome/browser/ui/sync/browser_synced_window_delegates_getter.cc b/chrome/browser/ui/sync/browser_synced_window_delegates_getter.cc
index 23071670227658be27042e70b8c8abb2129bcea3..b43e07b1b856256d3c26d28a071bbbdb0ded0956 100644
--- a/chrome/browser/ui/sync/browser_synced_window_delegates_getter.cc
+++ b/chrome/browser/ui/sync/browser_synced_window_delegates_getter.cc
@@ -16,14 +16,15 @@ BrowserSyncedWindowDelegatesGetter::BrowserSyncedWindowDelegatesGetter(
     : profile_(profile) {}
 BrowserSyncedWindowDelegatesGetter::~BrowserSyncedWindowDelegatesGetter() {}
 
-std::set<const sync_sessions::SyncedWindowDelegate*>
+BrowserSyncedWindowDelegatesGetter::SyncedWindowDelegateMap
 BrowserSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
-  std::set<const sync_sessions::SyncedWindowDelegate*> synced_window_delegates;
+  SyncedWindowDelegateMap synced_window_delegates;
   // Add all the browser windows.
   for (auto* browser : *BrowserList::GetInstance()) {
     if (browser->profile() != profile_)
       continue;
-    synced_window_delegates.insert(browser->synced_window_delegate());
+    synced_window_delegates[browser->synced_window_delegate()->GetSessionId()] =
+        browser->synced_window_delegate();
   }
   return synced_window_delegates;
 }