Removed xCallbackParameters from CRWSessionController class.

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 29 matching lines @@
 NSString* const kCertificatePolicyManagerKey = @"certificatePolicyManager";
 NSString* const kCurrentNavigationIndexKey = @"currentNavigationIndex";
 NSString* const kEntriesKey = @"entries";
 NSString* const kLastVisitedTimestampKey = @"lastVisitedTimestamp";
 NSString* const kOpenerIdKey = @"openerId";
 NSString* const kOpenedByDOMKey = @"openedByDOM";
 NSString* const kOpenerNavigationIndexKey = @"openerNavigationIndex";
 NSString* const kPreviousNavigationIndexKey = @"previousNavigationIndex";
 NSString* const kTabIdKey = @"tabId";
 NSString* const kWindowNameKey = @"windowName";
-NSString* const kXCallbackParametersKey = @"xCallbackParameters";
-}  // anonymous namespace
+}  // namespace
 
 @interface CRWSessionController () {
   // Weak pointer back to the owning NavigationManager. This is to facilitate
   // the incremental merging of the two classes.
   web::NavigationManagerImpl* _navigationManager;
 
   NSString* _tabId;  // Unique id of the tab.
   NSString* _openerId;  // Id of tab who opened this tab, empty/nil if none.
   // Navigation index of the tab which opened this tab. Do not rely on the
   // value of this member variable to indicate whether or not this tab has
@@ skipping 34 matching lines @@
   // If |YES|, override |currentEntry.useDesktopUserAgent| and create the
   // pending entry using the desktop user agent.
   BOOL _useDesktopUserAgentForNextPendingEntry;
 
   // The browser state associated with this CRWSessionController;
   web::BrowserState* _browserState;  // weak
 
   // Time smoother for navigation entry timestamps; see comment in
   // navigation_controller_impl.h
   web::TimeSmoother _timeSmoother;
-
-  // XCallback parameters used to create (or clobber) the tab. Can be nil.
-  XCallbackParameters* _xCallbackParameters;
 }
 
 // Redefine as readwrite.
 @property(nonatomic, readwrite, assign) NSInteger currentNavigationIndex;
 
 // TODO(rohitrao): These properties must be redefined readwrite to work around a
 // clang bug. crbug.com/228650
 @property(nonatomic, readwrite, copy) NSString* tabId;
 @property(nonatomic, readwrite, strong) NSArray* entries;
 @property(nonatomic, readwrite, strong)
@@ skipping 20 matching lines @@
 @synthesize tabId = _tabId;
 @synthesize currentNavigationIndex = _currentNavigationIndex;
 @synthesize previousNavigationIndex = _previousNavigationIndex;
 @synthesize entries = _entries;
 @synthesize windowName = _windowName;
 @synthesize lastVisitedTimestamp = _lastVisitedTimestamp;
 @synthesize openerId = _openerId;
 @synthesize openedByDOM = _openedByDOM;
 @synthesize openerNavigationIndex = _openerNavigationIndex;
 @synthesize sessionCertificatePolicyManager = _sessionCertificatePolicyManager;
-@synthesize xCallbackParameters = _xCallbackParameters;
 
 - (id)initWithWindowName:(NSString*)windowName
                 openerId:(NSString*)openerId
              openedByDOM:(BOOL)openedByDOM
    openerNavigationIndex:(NSInteger)openerIndex
             browserState:(web::BrowserState*)browserState {
   self = [super init];
   if (self) {
     self.windowName = windowName;
     _tabId = [[self uniqueID] copy];
@@ skipping 71 matching lines @@
     _entries = temp;
     // Prior to M34, 0 was used as "no index" instead of -1; adjust for that.
     if (![_entries count])
       _currentNavigationIndex = -1;
     _sessionCertificatePolicyManager =
         [aDecoder decodeObjectForKey:kCertificatePolicyManagerKey];
     if (!_sessionCertificatePolicyManager) {
       _sessionCertificatePolicyManager =
           [[CRWSessionCertificatePolicyManager alloc] init];
     }
-
-    _xCallbackParameters =
-        [aDecoder decodeObjectForKey:kXCallbackParametersKey];
   }
   return self;
 }
 
 - (void)encodeWithCoder:(NSCoder*)aCoder {
   [aCoder encodeObject:_tabId forKey:kTabIdKey];
   [aCoder encodeObject:_openerId forKey:kOpenerIdKey];
   [aCoder encodeBool:_openedByDOM forKey:kOpenedByDOMKey];
   [aCoder encodeInt:_openerNavigationIndex forKey:kOpenerNavigationIndexKey];
   [aCoder encodeObject:_windowName forKey:kWindowNameKey];
   [aCoder encodeInt:_currentNavigationIndex forKey:kCurrentNavigationIndexKey];
   [aCoder encodeInt:_previousNavigationIndex
              forKey:kPreviousNavigationIndexKey];
   [aCoder encodeDouble:_lastVisitedTimestamp forKey:kLastVisitedTimestampKey];
   [aCoder encodeObject:_entries forKey:kEntriesKey];
   [aCoder encodeObject:_sessionCertificatePolicyManager
                 forKey:kCertificatePolicyManagerKey];
-  [aCoder encodeObject:_xCallbackParameters forKey:kXCallbackParametersKey];
   // rendererInitiated is deliberately not preserved, as upstream.
 }
 
 - (id)copyWithZone:(NSZone*)zone {
   CRWSessionController* copy = [[[self class] alloc] init];
   copy->_tabId = [_tabId copy];
   copy->_openerId = [_openerId copy];
   copy->_openedByDOM = _openedByDOM;
   copy->_openerNavigationIndex = _openerNavigationIndex;
   copy.windowName = self.windowName;
   copy->_currentNavigationIndex = _currentNavigationIndex;
   copy->_previousNavigationIndex = _previousNavigationIndex;
   copy->_lastVisitedTimestamp = _lastVisitedTimestamp;
   copy->_entries =
       [[NSMutableArray alloc] initWithArray:_entries copyItems:YES];
   copy->_sessionCertificatePolicyManager =
       [_sessionCertificatePolicyManager copy];
-  copy->_xCallbackParameters = [base::mac::ObjCCastStrict<NSObject<NSCopying>>(
-      _xCallbackParameters) copy];
   return copy;
 }
 
 - (void)setCurrentNavigationIndex:(NSInteger)currentNavigationIndex {
   if (_currentNavigationIndex != currentNavigationIndex) {
     _currentNavigationIndex = currentNavigationIndex;
     if (_navigationManager)
       _navigationManager->RemoveTransientURLRewriters();
   }
 }
 
 - (void)setNavigationManager:(web::NavigationManagerImpl*)navigationManager {
   _navigationManager = navigationManager;
   if (_navigationManager) {
     // _browserState will be nullptr if CRWSessionController has been
     // initialized with -initWithCoder: method. Take _browserState from
     // NavigationManagerImpl if that's the case.
     if (!_browserState) {
       _browserState = _navigationManager->GetBrowserState();
     }
     DCHECK_EQ(_browserState, _navigationManager->GetBrowserState());
   }
 }
 
 - (NSString*)description {
   return [NSString
       stringWithFormat:
           @"id: %@\nname: %@\nlast visit: %f\ncurrent index: %" PRIdNS
-          @"\nprevious index: %" PRIdNS "\n%@\npending: %@\ntransient: %@\n"
-          @"xCallback:\n%@\n",
+          @"\nprevious index: %" PRIdNS "\n%@\npending: %@\ntransient: %@\n",
           _tabId, self.windowName, _lastVisitedTimestamp,
           _currentNavigationIndex, _previousNavigationIndex, _entries,
-          _pendingEntry.get(), _transientEntry.get(), _xCallbackParameters];
+          _pendingEntry.get(), _transientEntry.get()];
 }
 
 // Returns the current entry in the session list, or the pending entry if there
 // is a navigation in progress.
 - (CRWSessionEntry*)currentEntry {
   if (_transientEntry)
     return _transientEntry.get();
   if (_pendingEntry)
     return _pendingEntry.get();
   return [self lastCommittedEntry];
@@ skipping 236 matching lines @@
 }
 
 - (void)copyStateFromAndPrune:(CRWSessionController*)otherSession
                  replaceState:(BOOL)replaceState {
   DCHECK(otherSession);
   if (replaceState) {
     [_entries removeAllObjects];
     self.currentNavigationIndex = -1;
     _previousNavigationIndex = -1;
   }
-  self.xCallbackParameters = [base::mac::ObjCCastStrict<NSObject<NSCopying>>(
-      otherSession.xCallbackParameters) copy];
   self.windowName = otherSession.windowName;
   NSInteger numInitialEntries = [_entries count];
 
   // 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 unless replaceState is true.
   NSArray* otherEntries = [otherSession entries];
 
   // The other session may not have any entries, in which case there is nothing
   // to copy or prune.  The other session's currentNavigationEntry will be bogus
@@ skipping 293 matching lines @@
   std::unique_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl());
   item->SetURL(loaded_url);
   item->SetReferrer(referrer);
   item->SetTransitionType(transition);
   item->SetIsOverridingUserAgent(useDesktopUserAgent);
   item->set_is_renderer_initiated(rendererInitiated);
   return [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)];
 }
 
 @end