[ios] Allow having multiple session windows in a session.

ios/chrome/browser/crash_report/crash_restore_helper.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/crash_report/crash_restore_helper.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/sessions/ios/ios_live_tab.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_google_chrome_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/crash_report/breakpad_helper.h"
 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
+#import "ios/chrome/browser/sessions/session_ios.h"
 #import "ios/chrome/browser/sessions/session_service_ios.h"
 #import "ios/chrome/browser/sessions/session_window_ios.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 @protocol InfoBarManagerObserverBridgeProtocol
 - (void)infoBarRemoved:(infobars::InfoBar*)infobar;
@@ skipping 219 matching lines @@
   [self deleteSessionForBrowserState:otrBrowserState backupFile:nil];
   _needRestoration =
       [self deleteSessionForBrowserState:_browserState
                               backupFile:[self sessionBackupPath]];
 }
 
 - (BOOL)restoreSessionsAfterCrash {
   DCHECK(!_sessionRestored);
   _sessionRestored = YES;
   _infoBarBridge.reset();
-  SessionWindowIOS* sessionWindow = [[SessionServiceIOS sharedService]
-      loadSessionWindowFromPath:[self sessionBackupPath]];
-  if (sessionWindow) {
-    breakpad_helper::WillStartCrashRestoration();
-    return [_tabModel restoreSessionWindow:sessionWindow];
-  }
-  return NO;
+
+  SessionIOS* session = [[SessionServiceIOS sharedService]
+      loadSessionFromPath:[self sessionBackupPath]];
+  if (!session)
+    return NO;
+
+  DCHECK_EQ(session.sessionWindows.count, 1u);
+  breakpad_helper::WillStartCrashRestoration();
+  return [_tabModel restoreSessionWindow:session.sessionWindows[0]];
 }
 
 - (void)infoBarRemoved:(infobars::InfoBar*)infobar {
   DCHECK(infobar->delegate());
   if (_sessionRestored ||
       infobar->delegate()->GetIdentifier() !=
           infobars::InfoBarDelegate::SESSION_CRASHED_INFOBAR_DELEGATE) {
     return;
   }
 
   // If the infobar is dismissed without restoring the tabs (either by closing
   // it with the cross or after a navigation), all the entries will be added to
   // the recently closed tabs.
   _sessionRestored = YES;
 
-  SessionWindowIOS* window = [[SessionServiceIOS sharedService]
-      loadSessionWindowFromPath:[self sessionBackupPath]];
-  DCHECK(window);
-  NSArray* sessions = window.sessions;
+  SessionIOS* session = [[SessionServiceIOS sharedService]
+      loadSessionFromPath:[self sessionBackupPath]];
+  DCHECK_EQ(session.sessionWindows.count, 1u);
+
+  NSArray<CRWSessionStorage*>* sessions = session.sessionWindows[0].sessions;
   if (!sessions.count)
     return;
+
   sessions::TabRestoreService* const tabRestoreService =
       IOSChromeTabRestoreServiceFactory::GetForBrowserState(_browserState);
   tabRestoreService->LoadTabsFromLastSession();
 
   web::WebState::CreateParams params(_browserState);
   for (CRWSessionStorage* session in sessions) {
     std::unique_ptr<web::WebState> webState =
         web::WebState::CreateWithStorageSession(params, session);
     // Add all tabs at the 0 position as the position is relative to an old
     // tabModel.
     tabRestoreService->CreateHistoricalTab(
         sessions::IOSLiveTab::GetForWebState(webState.get()), 0);
   }
   return;
 }
 
 @end