Remove knowledge of extensions from TabRestoreServiceHelper

chrome/browser/sessions/tab_restore_service_helper.cc

 // 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 "chrome/browser/sessions/tab_restore_service_helper.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "components/sessions/content/content_serialized_navigation_builder.h"
 #include "components/sessions/core/tab_restore_service_client.h"
 #include "components/sessions/session_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #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;
 
 // TabRestoreServiceHelper::Observer -------------------------------------------
 
 TabRestoreServiceHelper::Observer::~Observer() {}
 
 void TabRestoreServiceHelper::Observer::OnClearEntries() {}
 
@@ skipping 355 matching lines @@
     tab->navigations[i] =
         sessions::ContentSerializedNavigationBuilder::FromNavigationEntry(
             i, *entry);
   }
   tab->timestamp = TimeNow();
   tab->current_navigation_index = controller->GetCurrentEntryIndex();
   if (tab->current_navigation_index == -1 && entry_count > 0)
     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();
 
   // TODO(ajwong): This does not correctly handle storage for isolated apps.
   tab->session_storage_namespace =
       controller->GetDefaultSessionStorageNamespace();
 
   // Delegate may be NULL during unit tests.
   if (delegate) {
@@ skipping 144 matching lines @@
       Tab* tab = static_cast<Tab*>(entry);
       if (tab->browser_id == old_id)
         tab->browser_id = new_id;
     }
   }
 }
 
 base::Time TabRestoreServiceHelper::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : base::Time::Now();
 }