Remove -insertTabWithWebState:atIndex: from TabModel.

ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.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.
 
 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/sessions/core/session_types.h"
 #include "components/sessions/ios/ios_serialized_navigation_builder.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_model_list.h"
-#import "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/public/navigation_item.h"
-#import "ios/web/web_state/web_state_impl.h"
 #import "net/base/mac/url_conversions.h"
 
-using web::WebStateImpl;
-
 TabRestoreServiceDelegateImplIOS::TabRestoreServiceDelegateImplIOS(
     ios::ChromeBrowserState* browser_state)
     : browser_state_(browser_state) {}
 
 TabRestoreServiceDelegateImplIOS::~TabRestoreServiceDelegateImplIOS() {}
 
 TabModel* TabRestoreServiceDelegateImplIOS::tab_model() const {
   return GetLastActiveTabModelForChromeBrowserState(browser_state_);
 }
 
@@ skipping 36 matching lines @@
     const std::vector<sessions::SerializedNavigationEntry>& navigations,
     int tab_index,
     int selected_navigation,
     const std::string& extension_app_id,
     bool select,
     bool pin,
     bool from_last_session,
     const sessions::PlatformSpecificTabData* tab_platform_data,
     const std::string& user_agent_override) {
   DCHECK_LT(selected_navigation, static_cast<int>(navigations.size()));
-
-  std::unique_ptr<WebStateImpl> webState(new WebStateImpl(browser_state_));
-  std::vector<std::unique_ptr<web::NavigationItem>> items =
+  DCHECK_GE(tab_index, 0);
+  web::ScopedNavigationItemList items =
       sessions::IOSSerializedNavigationBuilder::ToNavigationItems(navigations);
-  webState->GetNavigationManagerImpl().ReplaceSessionHistory(
-      std::move(items), selected_navigation);
-  TabModel* tabModel = tab_model();
-  Tab* tab =
-      [tabModel insertTabWithWebState:std::move(webState) atIndex:tab_index];
-  // TODO(crbug.com/661636): Handle tab-switch animation somehow...
-  [tabModel setCurrentTab:tab];
+  [tab_model() insertTabWithNavigationItems:std::move(items)
+                    selectedNavigationIndex:selected_navigation
+                                    atIndex:static_cast<NSUInteger>(tab_index)
+                               inBackground:NO];
   return nullptr;
 }
 
 sessions::LiveTab* TabRestoreServiceDelegateImplIOS::ReplaceRestoredTab(
     const std::vector<sessions::SerializedNavigationEntry>& navigations,
     int selected_navigation,
     bool from_last_session,
     const std::string& extension_app_id,
     const sessions::PlatformSpecificTabData* tab_platform_data,
     const std::string& user_agent_override) {
   DCHECK_LT(selected_navigation, static_cast<int>(navigations.size()));
 
   // Desktop Chrome creates a new tab and deletes the old one. The net result
   // is that the NTP is not in the session history of the restored tab. Do
   // the same by replacing the tab's navigation history which will also force it
   // to reload.
   Tab* tab = tab_model().currentTab;
   [tab replaceHistoryWithNavigations:navigations
                         currentIndex:selected_navigation];
   return nullptr;
 }
 
 void TabRestoreServiceDelegateImplIOS::CloseTab() {
   [[tab_model() currentTab] close];
 }