TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

Index: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index fe09f2932f35cf0b7bc37e42ce126084d79fd152..c83f4a4252259f59b0cc435aeb0801fc1573f13d 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
@@ -327,8 +327,7 @@ void TabRendererGtk::UpdateData(WebContents* contents,
                                 bool app,
                                 bool loading_only) {
   DCHECK(contents);
-  TabContentsWrapper* wrapper =
-      TabContentsWrapper::GetCurrentWrapperForContents(contents);
+  TabContents* tab_contents = TabContents::FromWebContents(contents);
 
   if (!loading_only) {
     data_.title = contents->GetTitle();
@@ -336,12 +335,11 @@ void TabRendererGtk::UpdateData(WebContents* contents,
     data_.crashed = contents->IsCrashed();
 
     SkBitmap* app_icon =
-        TabContentsWrapper::GetCurrentWrapperForContents(contents)->
-            extension_tab_helper()->GetExtensionAppIcon();
+        tab_contents->extension_tab_helper()->GetExtensionAppIcon();
     if (app_icon) {
       data_.favicon = *app_icon;
     } else {
-      data_.favicon = wrapper->favicon_tab_helper()->GetFavicon();
+      data_.favicon = tab_contents->favicon_tab_helper()->GetFavicon();
     }
 
     data_.app = app;
@@ -405,7 +403,7 @@ void TabRendererGtk::UpdateData(WebContents* contents,
   // Loading state also involves whether we show the favicon, since that's where
   // we display the throbber.
   data_.loading = contents->IsLoading();
-  data_.show_icon = wrapper->favicon_tab_helper()->ShouldDisplayFavicon();
+  data_.show_icon = tab_contents->favicon_tab_helper()->ShouldDisplayFavicon();
 }
 
 void TabRendererGtk::UpdateFromModel() {