Reland v5 of Sessions Refactor

chrome/browser/sync/glue/synced_window_delegates_getter_android.cc

Index: chrome/browser/sync/glue/synced_window_delegates_getter_android.cc
diff --git a/chrome/browser/sync/glue/synced_window_delegates_getter_android.cc b/chrome/browser/sync/glue/synced_window_delegates_getter_android.cc
index 3148e76ae9a423578b04a774be3485f103b895b5..22382a9bd6508da046c6b2d61a0a9575137482a3 100644
--- a/chrome/browser/sync/glue/synced_window_delegates_getter_android.cc
+++ b/chrome/browser/sync/glue/synced_window_delegates_getter_android.cc
@@ -15,11 +15,12 @@ namespace browser_sync {
 SyncedWindowDelegatesGetterAndroid::SyncedWindowDelegatesGetterAndroid() {}
 SyncedWindowDelegatesGetterAndroid::~SyncedWindowDelegatesGetterAndroid() {}
 
-std::set<const SyncedWindowDelegate*>
+SyncedWindowDelegatesGetterAndroid::SyncedWindowDelegateMap
 SyncedWindowDelegatesGetterAndroid::GetSyncedWindowDelegates() {
-  std::set<SyncedWindowDelegate const*> synced_window_delegates;
+  SyncedWindowDelegateMap synced_window_delegates;
   for (auto i = TabModelList::begin(); i != TabModelList::end(); ++i) {
-    synced_window_delegates.insert((*i)->GetSyncedWindowDelegate());
+    synced_window_delegates[(*i)->GetSyncedWindowDelegate()->GetSessionId()] =
+        (*i)->GetSyncedWindowDelegate();
   }
   return synced_window_delegates;
 }