Reland v5 of Sessions Refactor

components/sync_sessions/session_data_type_controller_unittest.cc

Index: components/sync_sessions/session_data_type_controller_unittest.cc
diff --git a/components/sync_sessions/session_data_type_controller_unittest.cc b/components/sync_sessions/session_data_type_controller_unittest.cc
index 8e4b7b703e6ee0cf349683b08ac7dcb3a693309a..e09bf7ee6649f463d9930ebb19a989802f915d2d 100644
--- a/components/sync_sessions/session_data_type_controller_unittest.cc
+++ b/components/sync_sessions/session_data_type_controller_unittest.cc
@@ -66,7 +66,7 @@ class MockSyncedWindowDelegate : public SyncedWindowDelegate {
 
 class MockSyncedWindowDelegatesGetter : public SyncedWindowDelegatesGetter {
  public:
-  std::set<const SyncedWindowDelegate*> GetSyncedWindowDelegates() override {
+  SyncedWindowDelegateMap GetSyncedWindowDelegates() override {
     return delegates_;
   }
 
@@ -74,10 +74,12 @@ class MockSyncedWindowDelegatesGetter : public SyncedWindowDelegatesGetter {
     return nullptr;
   }
 
-  void Add(SyncedWindowDelegate* delegate) { delegates_.insert(delegate); }
+  void Add(SyncedWindowDelegate* delegate) {
+    delegates_[delegate->GetSessionId()] = delegate;
+  }
 
  private:
-  std::set<const SyncedWindowDelegate*> delegates_;
+  SyncedWindowDelegateMap delegates_;
 };
 
 class TestSyncSessionsClient : public FakeSyncSessionsClient {