Switch ZoomTabHelper to use WebContentsUserData.

chrome/browser/ui/views/location_bar/zoom_bubble_view.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/views/location_bar/zoom_bubble_view.h"
 
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "grit/generated_resources.h"
@@ skipping 66 matching lines @@
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_insets(gfx::Insets(5, 0, 5, 0));
   set_use_focusless(auto_close);
   set_notify_enter_exit_on_child(true);
 }
 
 ZoomBubbleView::~ZoomBubbleView() {
 }
 
 void ZoomBubbleView::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();
   label_->SetText(
       l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent));
   StartTimerIfNecessary();
 }
 
 void ZoomBubbleView::Close() {
   GetWidget()->Close();
 }
 
 void ZoomBubbleView::StartTimerIfNecessary() {
@@ skipping 25 matching lines @@
 void ZoomBubbleView::ButtonPressed(views::Button* sender,
                                    const ui::Event& event) {
   chrome_page_zoom::Zoom(tab_contents_->web_contents(),
                          content::PAGE_ZOOM_RESET);
 }
 
 void ZoomBubbleView::Init() {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
       0, 0, views::kRelatedControlVerticalSpacing));
 
-  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();
   label_ = new views::Label(
       l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent));
   gfx::Font font = label_->font().DeriveFont(kPercentageFontIncrease);
   label_->SetFont(font);
   AddChildView(label_);
 
   AddChildView(new views::Separator());
 
   views::TextButton* set_default_button = new views::TextButton(
       this, l10n_util::GetStringUTF16(IDS_ZOOM_SET_DEFAULT));
   set_default_button->set_alignment(views::TextButtonBase::ALIGN_CENTER);
   AddChildView(set_default_button);
 
   StartTimerIfNecessary();
 }
 
 void ZoomBubbleView::WindowClosing() {
   // |zoom_bubble_| can be a new bubble by this point (as Close(); doesn't
   // call this right away). Only set to NULL when it's this bubble.
   if (zoom_bubble_ == this)
     zoom_bubble_ = NULL;
 }