Refactor serialisation of openerId & openerNavigationIndex.

ios/chrome/browser/tabs/tab_model_unittest.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 <objc/runtime.h>
 
 #include "base/files/file_path.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state_manager.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #include "ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h"
 #import "ios/chrome/browser/sessions/session_window.h"
 #import "ios/chrome/browser/sessions/test_session_service.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_model_observer.h"
 #import "ios/chrome/browser/tabs/tab_private.h"
 #import "ios/chrome/browser/web/chrome_web_client.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_state_manager.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
+#import "ios/web/public/serializable_user_data_manager.h"
 #include "ios/web/public/test/scoped_testing_web_client.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "ios/web/public/web_thread.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/web_state_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
@@ skipping 24 matching lines @@
 
 - (instancetype)initWithWindowName:(NSString*)windowName
               lastVisitedTimestamp:(double)lastVisitedTimestamp
                       browserState:(ios::ChromeBrowserState*)browserState
                           tabModel:(TabModel*)tabModel {
   id webControllerMock =
       [OCMockObject niceMockForClass:[CRWWebController class]];
 
   auto webStateImpl = base::MakeUnique<WebStateImpl>(browserState);
   webStateImpl->SetWebController(webControllerMock);
-  webStateImpl->GetNavigationManagerImpl().InitializeSession(windowName,
-                                                             @"opener", NO, -1);
+  webStateImpl->GetNavigationManagerImpl().InitializeSession(windowName, NO);
   [webStateImpl->GetNavigationManagerImpl().GetSessionController()
       setLastVisitedTimestamp:lastVisitedTimestamp];
 
   WebStateImpl* webStateImplPtr = webStateImpl.get();
   [[[webControllerMock stub] andReturnValue:OCMOCK_VALUE(webStateImplPtr)]
       webStateImpl];
   BOOL yes = YES;
   [[[webControllerMock stub] andReturnValue:OCMOCK_VALUE(yes)] isViewAlive];
 
   if ((self = [super initWithWebState:std::move(webStateImpl)
@@ skipping 69 matching lines @@
   ~TabModelTest() override {
     [tab_model_ removeObserver:tab_model_observer_];
     [tab_model_ browserStateDestroyed];
   }
 
  protected:
   std::unique_ptr<WebStateImpl> CreateWebState(NSString* windowName,
                                                NSString* opener,
                                                NSInteger index) {
     auto webState = base::MakeUnique<WebStateImpl>(chrome_browser_state_.get());
-    webState->GetNavigationManagerImpl().InitializeSession(windowName, opener,
-                                                           NO, index);
+    webState->GetNavigationManagerImpl().InitializeSession(windowName, NO);
+    if ([opener length] != 0) {
+      // Duplicate code from Tab initializer. Will be removed once the code
+      // is rewritten to remove the use of internal ios/web/ API (see issue
+      // http://crbug.com/620465 for progress).
+      web::SerializableUserDataManager* userDataManager =
+          web::SerializableUserDataManager::FromWebState(webState.get());
+      userDataManager->AddSerializableData(opener, @"OpenerID");
+      userDataManager->AddSerializableData(@(index), @"OpenerNavigationIndex");
+    }
     return webState;
   }
 
   std::unique_ptr<WebStateImpl> CreateWebState(NSString* windowName) {
     return CreateWebState(windowName, @"", -1);
   }
 
   std::unique_ptr<WebStateImpl> CreateChildWebState(Tab* parent) {
     return CreateWebState([parent windowName], parent.tabId, -1);
   }
@@ skipping 716 matching lines @@
   // Restoring TabModel session sends asynchronous tasks to IO thread, wait
   // for them to complete after destroying the TabModel.
   base::RunLoop().RunUntilIdle();
 
   // Clean up.
   EXPECT_TRUE([[NSFileManager defaultManager] removeItemAtPath:stashPath
                                                          error:nullptr]);
 }
 
 }  // anonymous namespace