[ios] TabIdTabHelper

ios/chrome/browser/tabs/tab_helper_util.mm

Index: ios/chrome/browser/tabs/tab_helper_util.mm
diff --git a/ios/chrome/browser/tabs/tab_helper_util.mm b/ios/chrome/browser/tabs/tab_helper_util.mm
index e266138bd93bc80c74bbeca8983c41c0768956af..bb1a60e7d87bc29bab2b4b5ed665f2fa37bb22a7 100644
--- a/ios/chrome/browser/tabs/tab_helper_util.mm
+++ b/ios/chrome/browser/tabs/tab_helper_util.mm
@@ -35,10 +35,14 @@
 #import "ios/chrome/browser/web/network_activity_indicator_tab_helper.h"
 #import "ios/chrome/browser/web/repost_form_tab_helper.h"
 #import "ios/chrome/browser/web/sad_tab_tab_helper.h"
+#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/web/public/web_state/web_state.h"
 
 void AttachTabHelpers(web::WebState* web_state) {
+  // TabIdHelper sets up the tab ID which is required for the creation of the
+  // Tab by LegacyTabHelper.
+  TabIdTabHelper::CreateForWebState(web_state);
   LegacyTabHelper::CreateForWebState(web_state);
   Tab* tab = LegacyTabHelper::GetTabForWebState(web_state);
   DCHECK(tab);
@@ -46,8 +50,8 @@ void AttachTabHelpers(web::WebState* web_state) {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(web_state->GetBrowserState());
 
-  // IOSChromeSessionTabHelper comes first because it sets up the tab ID,
-  // and other helpers may rely on that.
+  // IOSChromeSessionTabHelper sets up the session ID used by other helpers,
+  // so it needs to be created before them.
   IOSChromeSessionTabHelper::CreateForWebState(web_state);
 
   NetworkActivityIndicatorTabHelper::CreateForWebState(web_state, tab.tabId);