Refactor serialisation of openerId & openerNavigationIndex.

ios/web/navigation/crw_session_storage_unittest.mm

 // Copyright 2017 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/public/crw_session_storage.h"
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_item_storage_test_util.h"
@@ skipping 30 matching lines @@
   return (data1 == nullptr) == (data2 == nullptr) &&
          (!data1 || [data1->data() isEqualToDictionary:data2->data()]);
 }
 // Checks for equality between |session1| and |session2|.
 BOOL SessionStoragesAreEqual(CRWSessionStorage* session1,
                              CRWSessionStorage* session2) {
   // Check the rest of the properties.
   NSArray* items1 = session1.itemStorages;
   NSArray* items2 = session2.itemStorages;
   return ItemStorageListsAreEqual(items1, items2) &&
-         [session1.openerID isEqual:session2.openerID] &&
          session1.openedByDOM == session2.openedByDOM &&
-         session1.openerNavigationIndex == session2.openerNavigationIndex &&
          [session1.windowName isEqual:session2.windowName] &&
          session1.currentNavigationIndex == session2.currentNavigationIndex &&
          session1.previousNavigationIndex == session2.previousNavigationIndex &&
          session1.lastVisitedTimestamp == session2.lastVisitedTimestamp &&
          UserDataAreEqual(session1.userData, session2.userData);
 }
 }  // namespace
 
 class CRWNSessionStorageTest : public PlatformTest {
  protected:
   CRWNSessionStorageTest()
       : session_storage_([[CRWSessionStorage alloc] init]) {
     // Set up |session_storage_|.
-    [session_storage_ setOpenerID:@"openerID"];
     [session_storage_ setOpenedByDOM:YES];
-    [session_storage_ setOpenerNavigationIndex:2];
     [session_storage_ setWindowName:@"windowName"];
     [session_storage_ setCurrentNavigationIndex:4];
     [session_storage_ setPreviousNavigationIndex:3];
     [session_storage_ setLastVisitedTimestamp:CFAbsoluteTimeGetCurrent()];
     // Create an item storage.
     base::scoped_nsobject<CRWNavigationItemStorage> item_storage(
         [[CRWNavigationItemStorage alloc] init]);
     [item_storage setVirtualURL:GURL("http://init.test")];
     [item_storage setReferrer:web::Referrer(GURL("http://referrer.url"),
                                             web::ReferrerPolicyDefault)];
@@ skipping 16 matching lines @@
   base::scoped_nsobject<CRWSessionStorage> session_storage_;
 };
 
 // Tests that unarchiving CRWSessionStorage data results in an equivalent
 // storage.
 TEST_F(CRWNSessionStorageTest, EncodeDecode) {
   NSData* data = [NSKeyedArchiver archivedDataWithRootObject:session_storage_];
   id decoded = [NSKeyedUnarchiver unarchiveObjectWithData:data];
   EXPECT_TRUE(SessionStoragesAreEqual(session_storage_, decoded));
 }