Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/ui/tabs/pinned_tab_codec.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/ui/tabs/pinned_tab_codec.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ skipping 34 matching lines @@
   values->Append(value.release());
 }
 
 // Adds a DictionaryValue to |values| representing the pinned tab at the
 // specified index.
 static void EncodePinnedTab(TabStripModel* model,
                             int index,
                             ListValue* values) {
   scoped_ptr<DictionaryValue> value(new DictionaryValue());
 
-  TabContents* tab_contents = model->GetTabContentsAt(index);
+  content::WebContents* web_contents =
+      model->GetTabContentsAt(index)->web_contents();
   if (model->IsAppTab(index)) {
     const extensions::Extension* extension =
-        tab_contents->extension_tab_helper()->extension_app();
+        extensions::TabHelper::FromWebContents(web_contents)->extension_app();
     DCHECK(extension);
     value->SetString(kAppID, extension->id());
-    // For apps we use the launch url. We do this for the following reason:
-    // . the user is effectively restarting the app, so that returning them to
-    //   the app's launch page seems closest to what they expect.
+    // For apps we use the launch url. We do this because the user is
+    // effectively restarting the app, so returning them to the app's launch
+    // page seems closest to what they expect.
     value->SetString(kURL, extension->GetFullLaunchURL().spec());
     values->Append(value.release());
   } else {
-    NavigationEntry* entry =
-        tab_contents->web_contents()->GetController().GetActiveEntry();
-    if (!entry && tab_contents->web_contents()->GetController().GetEntryCount())
-      entry = tab_contents->web_contents()->GetController().GetEntryAtIndex(0);
+    NavigationEntry* entry = web_contents->GetController().GetActiveEntry();
+    if (!entry && web_contents->GetController().GetEntryCount())
+      entry = web_contents->GetController().GetEntryAtIndex(0);
     if (entry) {
       value->SetString(kURL, entry->GetURL().spec());
       values->Append(value.release());
     }
   }
 }
 
 // Invokes EncodePinnedTab for each pinned tab in browser.
 static void EncodePinnedTabs(Browser* browser, ListValue* values) {
   TabStripModel* tab_model = browser->tab_strip_model();
@@ skipping 73 matching lines @@
   for (size_t i = 0, max = tabs_list->GetSize(); i < max; ++i) {
     const base::DictionaryValue* tab_values = NULL;
     if (tabs_list->GetDictionary(i, &tab_values)) {
       StartupTab tab;
       if (DecodeTab(*tab_values, &tab))
         results.push_back(tab);
     }
   }
   return results;
 }