Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/sessions/session_service.cc

 // Copyright (c) 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/session_service.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 594 matching lines @@
 
     case chrome::NOTIFICATION_TAB_PARENTED: {
       TabContents* tab = content::Source<TabContents>(source).ptr();
       if (tab->profile() != profile())
         return;
       WebContents* web_contents = tab->web_contents();
       SessionTabHelper* session_tab_helper =
           SessionTabHelper::FromWebContents(web_contents);
       SetTabWindow(session_tab_helper->window_id(),
                    session_tab_helper->session_id());
-      if (tab->extension_tab_helper()->extension_app()) {
+      extensions::TabHelper* extensions_tab_helper =
+          extensions::TabHelper::FromWebContents(web_contents);
+      if (extensions_tab_helper &&
+          extensions_tab_helper->extension_app()) {
         SetTabExtensionAppID(
             session_tab_helper->window_id(),
             session_tab_helper->session_id(),
-            tab->extension_tab_helper()->extension_app()->id());
+            extensions_tab_helper->extension_app()->id());
       }
 
       // Record the association between the SessionStorageNamespace and the
       // tab.
       //
       // TODO(ajwong): This should be processing the whole map rather than
       // just the default. This in particular will not work for tabs with only
       // isolated apps which won't have a default partition.
       content::SessionStorageNamespace* session_storage_namespace =
           web_contents->GetController().GetDefaultSessionStorageNamespace();
@@ skipping 87 matching lines @@
         changed->type == content::NAVIGATION_TYPE_EXISTING_PAGE) {
         RecordSessionUpdateHistogramData(type,
                                          &last_updated_nav_entry_commit_time_);
       }
       break;
     }
 
     case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
       extensions::TabHelper* extension_tab_helper =
           content::Source<extensions::TabHelper>(source).ptr();
-      if (extension_tab_helper->tab_contents()->profile() != profile())
+      if (extension_tab_helper->web_contents()->GetBrowserContext() !=
+              profile()) {
         return;
+      }
       if (extension_tab_helper->extension_app()) {
         SessionTabHelper* session_tab_helper =
             SessionTabHelper::FromWebContents(
                 extension_tab_helper->web_contents());
         SetTabExtensionAppID(session_tab_helper->window_id(),
                              session_tab_helper->session_id(),
                              extension_tab_helper->extension_app()->id());
       }
       break;
     }
@@ skipping 580 matching lines @@
       tab->web_contents()->GetController().GetPendingEntryIndex();
   if (tab_to_available_range) {
     (*tab_to_available_range)[session_id.id()] =
         std::pair<int, int>(min_index, max_index);
   }
 
   if (is_pinned) {
     commands->push_back(CreatePinnedStateCommand(session_id, true));
   }
 
-  if (tab->extension_tab_helper()->extension_app()) {
+  extensions::TabHelper* extensions_tab_helper =
+      extensions::TabHelper::FromWebContents(tab->web_contents());
+  if (extensions_tab_helper->extension_app()) {
     commands->push_back(
         CreateSetTabExtensionAppIDCommand(
             kCommandSetExtensionAppID, session_id.id(),
-            tab->extension_tab_helper()->extension_app()->id()));
+            extensions_tab_helper->extension_app()->id()));
   }
 
   const std::string& ua_override = tab->web_contents()->GetUserAgentOverride();
   if (!ua_override.empty()) {
     commands->push_back(
         CreateSetTabUserAgentOverrideCommand(
             kCommandSetTabUserAgentOverride, session_id.id(), ua_override));
   }
 
   for (int i = min_index; i < max_index; ++i) {
@@ skipping 396 matching lines @@
       50);
   if (use_long_period) {
     std::string long_name_("SessionRestore.SaveLongPeriod");
     UMA_HISTOGRAM_CUSTOM_TIMES(long_name_,
         delta,
         save_delay_in_mins_,
         save_delay_in_hrs_,
         50);
   }
 }