TabContentsWrapper -> TabContents, part 41.

chrome/browser/ui/gtk/website_settings_popup_gtk.cc

Index: chrome/browser/ui/gtk/website_settings_popup_gtk.cc
diff --git a/chrome/browser/ui/gtk/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings_popup_gtk.cc
index ec74b5e3c54eda3b0921287cf254e06de17638ae..2e2d88e3f4c360ca9563da8687bf53433a0ebe53 100644
--- a/chrome/browser/ui/gtk/website_settings_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/website_settings_popup_gtk.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/cert_store.h"
@@ -72,23 +72,23 @@ std::string PermissionValueToString(ContentSetting value) {
 // static
 void WebsiteSettingsPopupGtk::Show(gfx::NativeWindow parent,
                                    Profile* profile,
-                                   TabContentsWrapper* tab_contents_wrapper,
+                                   TabContents* tab_contents,
                                    const GURL& url,
                                    const content::SSLStatus& ssl) {
-  new WebsiteSettingsPopupGtk(parent, profile, tab_contents_wrapper, url, ssl);
+  new WebsiteSettingsPopupGtk(parent, profile, tab_contents, url, ssl);
 }
 
 WebsiteSettingsPopupGtk::WebsiteSettingsPopupGtk(
     gfx::NativeWindow parent,
     Profile* profile,
-    TabContentsWrapper* tab_contents_wrapper,
+    TabContents* tab_contents,
     const GURL& url,
     const content::SSLStatus& ssl)
     : parent_(parent),
       contents_(NULL),
       theme_service_(GtkThemeService::GetFrom(profile)),
       profile_(profile),
-      tab_contents_wrapper_(tab_contents_wrapper),
+      tab_contents_(tab_contents),
       browser_(NULL),
       cert_id_(0),
       header_box_(NULL),
@@ -123,7 +123,7 @@ WebsiteSettingsPopupGtk::WebsiteSettingsPopupGtk(
   }
 
   presenter_.reset(new WebsiteSettings(this, profile,
-                                       tab_contents_wrapper->content_settings(),
+                                       tab_contents->content_settings(),
                                        url, ssl,
                                        content::CertStore::GetInstance()));
 }
@@ -499,7 +499,7 @@ void WebsiteSettingsPopupGtk::OnComboBoxShown(GtkWidget* widget,
 
 void WebsiteSettingsPopupGtk::OnCookiesLinkClicked(GtkWidget* widget) {
   new CollectedCookiesGtk(GTK_WINDOW(parent_),
-                          tab_contents_wrapper_);
+                          tab_contents_);
   bubble_->Close();
 }