Reland v5 of Sessions Refactor

components/sync_sessions/session_data_type_controller.cc

Index: components/sync_sessions/session_data_type_controller.cc
diff --git a/components/sync_sessions/session_data_type_controller.cc b/components/sync_sessions/session_data_type_controller.cc
index 07705c3c1a26ff0e8eb3f44e1fda12188afb00e7..4ec2abc5aa2762dd191bfb0bfd6d8cbb62f6703c 100644
--- a/components/sync_sessions/session_data_type_controller.cc
+++ b/components/sync_sessions/session_data_type_controller.cc
@@ -44,11 +44,10 @@ bool SessionDataTypeController::StartModels() {
   DCHECK(CalledOnValidThread());
   SyncedWindowDelegatesGetter* synced_window_getter =
       sync_client_->GetSyncSessionsClient()->GetSyncedWindowDelegatesGetter();
-  std::set<const SyncedWindowDelegate*> window =
+  SyncedWindowDelegatesGetter::SyncedWindowDelegateMap windows =
       synced_window_getter->GetSyncedWindowDelegates();
-  for (std::set<const SyncedWindowDelegate*>::const_iterator i = window.begin();
-       i != window.end(); ++i) {
-    if ((*i)->IsSessionRestoreInProgress()) {
+  for (const auto& window_iter_pair : windows) {
+    if (window_iter_pair.second->IsSessionRestoreInProgress()) {
       waiting_on_session_restore_ = true;
       break;
     }