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

ios/chrome/browser/test/perf_test_with_bvc_ios.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.
 
 #include "ios/chrome/browser/test/perf_test_with_bvc_ios.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state_manager.h"
 #include "ios/chrome/browser/search_engines/template_url_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_model.h"
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 #import "ios/chrome/browser/ui/browser_view_controller_dependency_factory.h"
 #import "ios/chrome/browser/ui/preload_controller.h"
 #import "ios/chrome/browser/web/chrome_web_client.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 
 // Subclass of PrerenderController so it isn't actually used. Using a mock for
@@ skipping 84 matching lines @@
           chrome_browser_state_.get()));
   ASSERT_TRUE(chrome_browser_state_->CreateHistoryService(false));
 
   // Force creation of AutocompleteClassifier instance.
   ios::AutocompleteClassifierFactory::GetForBrowserState(
       chrome_browser_state_.get());
 
   // Use the session to create a window which will contain the tab models.
   NSString* state_path = base::SysUTF8ToNSString(
       chrome_browser_state_->GetStatePath().AsUTF8Unsafe());
-  SessionWindowIOS* session_window = [[SessionServiceIOS sharedService]
-      loadSessionWindowFromDirectory:state_path];
+  SessionIOS* session =
+      [[SessionServiceIOS sharedService] loadSessionFromDirectory:state_path];
+  DCHECK_EQ(session.sessionWindows.count, 1u);
 
   // Tab models. The off-the-record (OTR) tab model is required for the stack
   // view controller, which is created in OpenStackView().
   tab_model_.reset([[TabModel alloc]
-      initWithSessionWindow:session_window
+      initWithSessionWindow:session.sessionWindows[0]
              sessionService:[SessionServiceIOS sharedService]
                browserState:chrome_browser_state_.get()]);
   otr_tab_model_.reset([[TabModel alloc]
-      initWithSessionWindow:session_window
+      initWithSessionWindow:session.sessionWindows[0]
              sessionService:[SessionServiceIOS sharedService]
                browserState:chrome_browser_state_
                                 ->GetOffTheRecordChromeBrowserState()]);
 
   // Create the browser view controller with its testing factory.
   bvc_factory_.reset([[TestBVCDependencyFactory alloc]
       initWithBrowserState:chrome_browser_state_.get()]);
   bvc_.reset([[BrowserViewController alloc]
        initWithTabModel:tab_model_
            browserState:chrome_browser_state_.get()
@@ skipping 26 matching lines @@
   // NSAutoreleasePool can drain. This needs to be done before
   // |chrome_browser_state_| can be cleared. For tests that allocate more
   // objects, more runloop time may be required.
   if (slow_teardown_)
     SpinRunLoop(.5);
   PerfTest::TearDown();
 
   // The profiles can be deallocated only after the BVC has been deallocated.
   chrome_browser_state_.reset();
 }