Moved TabID implementation to SerializableUserData.

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 <map>
@@ skipping 19 matching lines @@
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 @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
   // an opener, as both 0 and -1 are used as navigationIndex values.
   NSInteger _openerNavigationIndex;
   // Identifies the index of the current navigation in the CRWSessionEntry
   // array.
   NSInteger _currentNavigationIndex;
   // Identifies the index of the previous navigation in the CRWSessionEntry
   // array.
@@ skipping 28 matching lines @@
   // |_items|.
   std::unique_ptr<web::NavigationItemImpl> _pendingItem;
   std::unique_ptr<web::NavigationItemImpl> _transientItem;
 }
 
 // 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)
     CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager;
 
 // Expose setters for serialization properties.  These are exposed in a category
 // in SessionStorageBuilder, and will be removed as ownership of
 // their backing ivars moves to NavigationManagerImpl.
 @property(nonatomic, readwrite, copy) NSString* openerId;
 @property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM;
 @property(nonatomic, readwrite, assign) NSInteger openerNavigationIndex;
 @property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex;
 
-- (NSString*)uniqueID;
 // Removes all items after currentNavigationIndex_.
 - (void)clearForwardItems;
 // Discards the transient item, if any.
 - (void)discardTransientItem;
 // Creates a NavigationItemImpl with the specified properties.
 - (std::unique_ptr<web::NavigationItemImpl>)
         itemWithURL:(const GURL&)url
            referrer:(const web::Referrer&)referrer
          transition:(ui::PageTransition)transition
 useDesktopUserAgent:(BOOL)useDesktopUserAgent
   rendererInitiated:(BOOL)rendererInitiated;
 // Returns YES if the PageTransition for the underlying navigationItem at
 // |index| in |items| has ui::PAGE_TRANSITION_IS_REDIRECT_MASK.
 - (BOOL)isRedirectTransitionForItemAtIndex:(size_t)index;
 // Returns the CRWSessionEntry corresponding with |item|.
 - (CRWSessionEntry*)entryForItem:(web::NavigationItemImpl*)item;
 // Returns an autoreleased NSArray containing CRWSessionEntries corresponding
 // with the NavigationItems in |itemList|.
 - (NSArray*)entryListForItemList:(const web::NavigationItemList&)itemList;
 
 @end
 
 @implementation CRWSessionController
 
-@synthesize tabId = _tabId;
 @synthesize currentNavigationIndex = _currentNavigationIndex;
 @synthesize previousNavigationIndex = _previousNavigationIndex;
 @synthesize pendingItemIndex = _pendingItemIndex;
 @synthesize windowName = _windowName;
 @synthesize lastVisitedTimestamp = _lastVisitedTimestamp;
 @synthesize openerId = _openerId;
 @synthesize openedByDOM = _openedByDOM;
 @synthesize openerNavigationIndex = _openerNavigationIndex;
 @synthesize sessionCertificatePolicyManager = _sessionCertificatePolicyManager;
 
 - (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];
     _openerId = [openerId copy];
     _openedByDOM = openedByDOM;
     _openerNavigationIndex = openerIndex;
     _browserState = browserState;
     _lastVisitedTimestamp = [[NSDate date] timeIntervalSince1970];
     _currentNavigationIndex = -1;
     _previousNavigationIndex = -1;
     _pendingItemIndex = -1;
     _sessionCertificatePolicyManager =
         [[CRWSessionCertificatePolicyManager alloc] init];
   }
   return self;
 }
 
 - (id)initWithNavigationItems:(web::ScopedNavigationItemList)items
                  currentIndex:(NSUInteger)currentIndex
                  browserState:(web::BrowserState*)browserState {
   self = [super init];
   if (self) {
-    _tabId = [[self uniqueID] copy];
     _openerId = nil;
     _browserState = browserState;
     _items = web::CreateScopedNavigationItemImplList(std::move(items));
     self.currentNavigationIndex = currentIndex;
     if (_items.empty())
       self.currentNavigationIndex = -1;
     _currentNavigationIndex = std::min(
         _currentNavigationIndex, static_cast<NSInteger>(_items.size() - 1));
     _previousNavigationIndex = -1;
     _pendingItemIndex = -1;
@@ skipping 148 matching lines @@
 
 // DEPRECATED
 - (NSArray*)forwardEntries {
   return [self entryListForItemList:self.forwardItems];
 }
 
 #pragma mark - NSObject
 
 - (NSString*)description {
   return [NSString
-      stringWithFormat:
-          @"id: %@\nname: %@\nlast visit: %f\ncurrent index: %" PRIdNS
-          @"\nprevious index: %" PRIdNS @"\npending index: %" PRIdNS
-                                        @"\n%@\npending: %@\ntransient: %@\n",
-          _tabId, self.windowName, _lastVisitedTimestamp,
-          _currentNavigationIndex, _previousNavigationIndex, _pendingItemIndex,
-          self.entries, self.pendingEntry, self.transientEntry];
+      stringWithFormat:@"name: %@\nlast visit: %f\ncurrent index: %" PRIdNS
+                       @"\nprevious index: %" PRIdNS
+                       @"\npending index: %" PRIdNS
+                       @"\n%@\npending: %@\ntransient: %@\n",
+                       self.windowName, _lastVisitedTimestamp,
+                       _currentNavigationIndex, _previousNavigationIndex,
+                       _pendingItemIndex, self.entries, self.pendingEntry,
+                       self.transientEntry];
 }
 
 #pragma mark - NSCopying
 
 - (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->_pendingItemIndex = _pendingItemIndex;
   copy->_lastVisitedTimestamp = _lastVisitedTimestamp;
   copy->_sessionCertificatePolicyManager =
       [_sessionCertificatePolicyManager copy];
@@ skipping 313 matching lines @@
   for (size_t index = 0; index < self.items.size(); ++index) {
     if (self.items[index].get() == item)
       return index;
   }
   return NSNotFound;
 }
 
 #pragma mark -
 #pragma mark Private methods
 
-- (NSString*)uniqueID {
-  CFUUIDRef uuidRef = CFUUIDCreate(NULL);
-  CFStringRef uuidStringRef = CFUUIDCreateString(NULL, uuidRef);
-  CFRelease(uuidRef);
-
-  NSString* uuid =
-      [NSString stringWithString:base::mac::ObjCCastStrict<NSString>(
-                                     CFBridgingRelease(uuidStringRef))];
-  return uuid;
-}
-
 - (std::unique_ptr<web::NavigationItemImpl>)
         itemWithURL:(const GURL&)url
            referrer:(const web::Referrer&)referrer
          transition:(ui::PageTransition)transition
 useDesktopUserAgent:(BOOL)useDesktopUserAgent
   rendererInitiated:(BOOL)rendererInitiated {
   GURL loaded_url(url);
   BOOL urlWasRewritten = NO;
   if (_navigationManager) {
     std::unique_ptr<std::vector<web::BrowserURLRewriter::URLRewriter>>
@@ skipping 38 matching lines @@
       [[NSMutableArray alloc] initWithCapacity:itemList.size()];
   for (web::NavigationItem* item : itemList) {
     CRWSessionEntry* entry =
         [self entryForItem:static_cast<web::NavigationItemImpl*>(item)];
     [entryList addObject:entry];
   }
   return entryList;
 }
 
 @end