Switch ZoomTabHelper to use WebContentsUserData.

chrome/browser/ui/gtk/zoom_bubble_gtk.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/gtk/zoom_bubble_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 58 matching lines @@
       tab_contents_(tab_contents) {
   GtkThemeService* theme_service =
       GtkThemeService::GetFrom(Profile::FromBrowserContext(
           tab_contents->web_contents()->GetBrowserContext()));
 
   event_box_ = gtk_event_box_new();
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE);
   GtkWidget* container = gtk_vbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(event_box_), container);
 
-  int zoom_percent = tab_contents->zoom_controller()->zoom_percent();
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(tab_contents->web_contents());
+  int zoom_percent = zoom_controller->zoom_percent();
   std::string percentage_text = UTF16ToUTF8(l10n_util::GetStringFUTF16Int(
       IDS_TOOLTIP_ZOOM, zoom_percent));
   label_ = theme_service->BuildLabel(percentage_text, ui::kGdkBlack);
   gtk_widget_modify_font(label_, pango_font_description_from_string("13"));
   gtk_misc_set_padding(GTK_MISC(label_),
                        ui::kControlSpacing, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(container), label_, FALSE, FALSE, 0);
 
   GtkWidget* separator = gtk_hseparator_new();
   gtk_box_pack_start(GTK_BOX(container), separator, FALSE, FALSE, 0);
@@ skipping 50 matching lines @@
   StartTimerIfNecessary();
 }
 
 ZoomBubbleGtk::~ZoomBubbleGtk() {
   DCHECK_EQ(g_bubble, this);
   // Set singleton pointer to NULL.
   g_bubble = NULL;
 }
 
 void ZoomBubbleGtk::Refresh() {
-  int zoom_percent = tab_contents_->zoom_controller()->zoom_percent();
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(tab_contents_->web_contents());
+  int zoom_percent = zoom_controller->zoom_percent();
   string16 text =
       l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent);
   gtk_label_set_text(GTK_LABEL(g_bubble->label_), UTF16ToUTF8(text).c_str());
   StartTimerIfNecessary();
 }
 
 void ZoomBubbleGtk::StartTimerIfNecessary() {
   if (!auto_close_ || mouse_inside_)
     return;
 
@@ skipping 37 matching lines @@
   StopTimerIfNecessary();
   return FALSE;
 }
 
 gboolean ZoomBubbleGtk::OnMouseLeave(GtkWidget* widget,
                                      GdkEventCrossing* event) {
   mouse_inside_ = false;
   StartTimerIfNecessary();
   return FALSE;
 }