Remove knowledge of extensions from TabRestoreServiceHelper

chrome/browser/sessions/tab_restore_service_helper.cc

Index: chrome/browser/sessions/tab_restore_service_helper.cc
diff --git a/chrome/browser/sessions/tab_restore_service_helper.cc b/chrome/browser/sessions/tab_restore_service_helper.cc
index 32797853cb86fcfa4322e1a9c8ef64bed5e317e6..6c492c1f7108ad4f312cd01a0c80e898a475494a 100644
--- a/chrome/browser/sessions/tab_restore_service_helper.cc
+++ b/chrome/browser/sessions/tab_restore_service_helper.cc
@@ -20,10 +20,6 @@
 #include "content/public/browser/session_storage_namespace.h"
 #include "content/public/browser/web_contents.h"
 
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/tab_helper.h"
-#endif
-
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
@@ -399,17 +395,8 @@ void TabRestoreServiceHelper::PopulateTab(
     tab->current_navigation_index = 0;
   tab->tabstrip_index = index;
 
-#if defined(ENABLE_EXTENSIONS)
-  extensions::TabHelper* extensions_tab_helper =
-      extensions::TabHelper::FromWebContents(controller->GetWebContents());
-  // extensions_tab_helper is NULL in some browser tests.
-  if (extensions_tab_helper) {
-    const extensions::Extension* extension =
-        extensions_tab_helper->extension_app();
-    if (extension)
-      tab->extension_app_id = extension->id();
-  }
-#endif
+  tab->extension_app_id =
+      client_->GetExtensionAppIDForWebContents(controller->GetWebContents());
 
   tab->user_agent_override =
       controller->GetWebContents()->GetUserAgentOverride();