Remove windowName from CRWSessionController.

ios/web/navigation/crw_session_controller.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/web/navigation/crw_session_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 41 matching lines @@
   // displayed tab is.  It backs the property of the same name and should only
   // be set through its setter.
   base::scoped_nsobject<CRWSessionEntry> _pendingEntry;
 
   // The transient entry, if any. A transient entry is discarded on any
   // navigation, and is used for representing interstitials that need to be
   // represented in the session.  It backs the property of the same name and
   // should only be set through its setter.
   base::scoped_nsobject<CRWSessionEntry> _transientEntry;
 
-  // The window name associated with the session.
-  NSString* _windowName;
-
    // Stores the certificate policies decided by the user.
   CRWSessionCertificatePolicyManager* _sessionCertificatePolicyManager;
 
   // The timestamp of the last time this tab is visited, represented in time
   // interval since 1970.
   NSTimeInterval _lastVisitedTimestamp;
 
   // The browser state associated with this CRWSessionController;
   web::BrowserState* _browserState;  // weak
 
@@ skipping 33 matching lines @@
 // Returns a NavigationItemList containing the NavigationItems from |entries|.
 - (web::NavigationItemList)itemListForEntryList:(NSArray*)entries;
 @end
 
 @implementation CRWSessionController
 
 @synthesize currentNavigationIndex = _currentNavigationIndex;
 @synthesize previousNavigationIndex = _previousNavigationIndex;
 @synthesize pendingItemIndex = _pendingItemIndex;
 @synthesize entries = _entries;
-@synthesize windowName = _windowName;
 @synthesize lastVisitedTimestamp = _lastVisitedTimestamp;
 @synthesize openedByDOM = _openedByDOM;
 @synthesize sessionCertificatePolicyManager = _sessionCertificatePolicyManager;
 
-- (instancetype)initWithWindowName:(NSString*)windowName
-                       openedByDOM:(BOOL)openedByDOM
-                      browserState:(web::BrowserState*)browserState {
+- (instancetype)initWithBrowserState:(web::BrowserState*)browserState
+                         openedByDOM:(BOOL)openedByDOM {
   self = [super init];
   if (self) {
-    self.windowName = windowName;
     _openedByDOM = openedByDOM;
     _browserState = browserState;
     _entries = [NSMutableArray array];
     _lastVisitedTimestamp = [[NSDate date] timeIntervalSince1970];
     _currentNavigationIndex = -1;
     _previousNavigationIndex = -1;
     _pendingItemIndex = -1;
     _sessionCertificatePolicyManager =
         [[CRWSessionCertificatePolicyManager alloc] init];
   }
   return self;
 }
 
-- (instancetype)initWithNavigationItems:
-                    (std::vector<std::unique_ptr<web::NavigationItem>>)items
-                           currentIndex:(NSUInteger)currentIndex
-                           browserState:(web::BrowserState*)browserState {
+- (instancetype)initWithBrowserState:(web::BrowserState*)browserState
+                     navigationItems:(web::ScopedNavigationItemList)items
+                        currentIndex:(NSUInteger)currentIndex {
   self = [super init];
   if (self) {
     _browserState = browserState;
 
     // Create entries array from list of navigations.
     _entries = [[NSMutableArray alloc] initWithCapacity:items.size()];
-
     for (auto& item : items) {
       base::scoped_nsobject<CRWSessionEntry> entry(
           [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]);
       [_entries addObject:entry];
     }
     self.currentNavigationIndex = currentIndex;
     // Prior to M34, 0 was used as "no index" instead of -1; adjust for that.
     if (![_entries count])
       self.currentNavigationIndex = -1;
     if (_currentNavigationIndex >= static_cast<NSInteger>(items.size())) {
       self.currentNavigationIndex = static_cast<NSInteger>(items.size()) - 1;
     }
     _previousNavigationIndex = -1;
     _pendingItemIndex = -1;
     _lastVisitedTimestamp = [[NSDate date] timeIntervalSince1970];
     _sessionCertificatePolicyManager =
         [[CRWSessionCertificatePolicyManager alloc] init];
   }
   return self;
 }
 
 - (id)copyWithZone:(NSZone*)zone {
   CRWSessionController* copy = [[[self class] alloc] init];
   copy->_openedByDOM = _openedByDOM;
-  copy.windowName = self.windowName;
   copy->_currentNavigationIndex = _currentNavigationIndex;
   copy->_previousNavigationIndex = _previousNavigationIndex;
   copy->_pendingItemIndex = _pendingItemIndex;
   copy->_lastVisitedTimestamp = _lastVisitedTimestamp;
   copy->_entries =
       [[NSMutableArray alloc] initWithArray:_entries copyItems:YES];
   copy->_sessionCertificatePolicyManager =
       [_sessionCertificatePolicyManager copy];
   return copy;
 }
@@ skipping 29 matching lines @@
 }
 
 - (void)setBrowserState:(web::BrowserState*)browserState {
   _browserState = browserState;
   DCHECK(!_navigationManager ||
          _navigationManager->GetBrowserState() == _browserState);
 }
 
 - (NSString*)description {
   return [NSString
-      stringWithFormat:@"name: %@\nlast visit: %f\ncurrent index: %" PRIdNS
+      stringWithFormat:@"last visit: %f\ncurrent index: %" PRIdNS
                        @"\nprevious index: %" PRIdNS
                        @"\npending index: %" PRIdNS
                        @"\n%@\npending: %@\ntransient: %@\n",
-                       self.windowName, _lastVisitedTimestamp,
-                       _currentNavigationIndex, _previousNavigationIndex,
-                       _pendingItemIndex, _entries, _pendingEntry.get(),
-                       _transientEntry.get()];
+                       _lastVisitedTimestamp, _currentNavigationIndex,
+                       _previousNavigationIndex, _pendingItemIndex, _entries,
+                       _pendingEntry.get(), _transientEntry.get()];
 }
 
 - (web::NavigationItemList)items {
   return [self itemListForEntryList:self.entries];
 }
 
 - (web::NavigationItemImpl*)currentItem {
   return self.currentEntry.navigationItemImpl;
 }
 
@@ skipping 287 matching lines @@
   // Keep the entry alive temporarily. There are flows that get the current
   // entry, do some navigation operation, and then try to use that old current
   // entry; since navigations clear the transient entry, these flows might
   // crash. (This should be removable once more session management is handled
   // within this class and/or NavigationManager).
   _transientEntry.reset();
 }
 
 - (void)insertStateFromSessionController:(CRWSessionController*)sourceSession {
   DCHECK(sourceSession);
-  self.windowName = sourceSession.windowName;
-
   // The other session may not have any entries, in which case there is nothing
   // to insert.  The other session's currentNavigationEntry will be bogus
   // in such cases, so ignore it and return early.
   NSArray* sourceEntries = sourceSession.entries;
   if (!sourceEntries.count)
     return;
 
   // Cycle through the entries from the other session and insert them before any
   // entries from this session.  Do not copy anything that comes after the other
   // session's current entry.
@@ skipping 154 matching lines @@
 }
 
 - (web::NavigationItemList)itemListForEntryList:(NSArray*)entries {
   web::NavigationItemList list(entries.count);
   for (size_t index = 0; index < entries.count; ++index)
     list[index] = [entries[index] navigationItem];
   return list;
 }
 
 @end