Refactor serialisation of openerId & openerNavigationIndex.

ios/chrome/browser/tabs/tab.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/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 160 matching lines @@
 
 namespace {
 class TabHistoryContext;
 class FaviconDriverObserverBridge;
 class TabInfoBarObserver;
 
 // The key under which the Tab ID is stored in the WebState's serializable user
 // data.
 NSString* const kTabIDKey = @"TabID";
 
+// The key under which the opener Tab ID is stored in the WebState's
+// serializable user data.
+NSString* const kOpenerIDKey = @"OpenerID";
+
+// The key under which the opener navigation index is stored in the WebState's
+// serializable user data.
+NSString* const kOpenerNavigationIndexKey = @"OpenerNavigationIndex";
+
 // Name of histogram for recording the state of the tab when the renderer is
 // terminated.
 const char kRendererTerminationStateHistogram[] =
     "Tab.StateAtRendererTermination";
 
 // Referrer used for clicks on article suggestions on the NTP.
 const char kChromeContentSuggestionsReferrer[] =
     "https://www.googleapis.com/auth/chrome-content-suggestions";
 
 // Enum corresponding to UMA's TabForegroundState, for
@@ skipping 299 matching lines @@
 @synthesize isVoiceSearchResultsTab = isVoiceSearchResultsTab_;
 @synthesize delegate = delegate_;
 @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_;
 @synthesize tabHeadersDelegate = tabHeadersDelegate_;
 
 - (instancetype)initWithWindowName:(NSString*)windowName
                             opener:(Tab*)opener
                        openedByDOM:(BOOL)openedByDOM
                              model:(TabModel*)parentModel
                       browserState:(ios::ChromeBrowserState*)browserState {
-  NSInteger openerIndex = -1;
-  if ([opener navigationManager]) {
-    NavigationManagerImpl* openerNavManager = [opener navigationManager];
-    openerIndex = openerNavManager->GetLastCommittedItemIndex();
-  }
   std::unique_ptr<web::WebStateImpl> webState(
       new web::WebStateImpl(browserState));
-  webState->GetNavigationManagerImpl().InitializeSession(
-      windowName, opener.tabId, openedByDOM, openerIndex);
+  webState->GetNavigationManagerImpl().InitializeSession(windowName,
+                                                         openedByDOM);
+  if ([opener navigationManager]) {
+    web::SerializableUserDataManager* userDataManager =
+        web::SerializableUserDataManager::FromWebState(webState.get());
+    userDataManager->AddSerializableData(opener.tabId, kOpenerIDKey);
+    userDataManager->AddSerializableData(
+        @([opener navigationManager]->GetLastCommittedItemIndex()),
+        kOpenerNavigationIndexKey);
+  }
 
   return [self initWithWebState:std::move(webState) model:parentModel];
 }
 
 - (instancetype)initWithWebState:(std::unique_ptr<web::WebState>)webState
                            model:(TabModel*)parentModel {
   return [self initWithWebState:std::move(webState)
                           model:parentModel
                attachTabHelpers:YES];
 }
@@ skipping 273 matching lines @@
   web::SerializableUserDataManager* userDataManager =
       web::SerializableUserDataManager::FromWebState(self.webState);
   id<NSCoding> tabID = userDataManager->GetValueForSerializationKey(kTabIDKey);
   if (!tabID) {
     tabID = [[NSUUID UUID] UUIDString];
     userDataManager->AddSerializableData(tabID, kTabIDKey);
   }
   return base::mac::ObjCCastStrict<NSString>(tabID);
 }
 
+- (NSString*)openerID {
+  DCHECK(self.webState);
+  web::SerializableUserDataManager* userDataManager =
+      web::SerializableUserDataManager::FromWebState(self.webState);
+  id<NSCoding> openerID =
+      userDataManager->GetValueForSerializationKey(kOpenerIDKey);
+  return base::mac::ObjCCastStrict<NSString>(openerID);
+}
+
+- (NSInteger)openerNavigationIndex {
+  DCHECK(self.webState);
+  web::SerializableUserDataManager* userDataManager =
+      web::SerializableUserDataManager::FromWebState(self.webState);
+  id<NSCoding> openerNavigationIndex =
+      userDataManager->GetValueForSerializationKey(kOpenerNavigationIndexKey);
+  if (!openerNavigationIndex)
+    return -1;
+  return base::mac::ObjCCastStrict<NSNumber>(openerNavigationIndex)
+      .integerValue;
+}
+
 - (web::WebState*)webState {
   return webStateImpl_.get();
 }
 
 - (void)fetchFavicon {
   const GURL& url = self.url;
   if (!url.is_valid())
     return;
 
   favicon::FaviconDriver* faviconDriver =
@@ skipping 1397 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end