Refactor browser window zoom handling and enable zoom icon on all platforms.

chrome/test/base/test_browser_window.h

Index: chrome/test/base/test_browser_window.h
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index 4ef2ab7ffadc63b04ed8f528425799031f86e07b..485aa284473662ea284bcd19625be08f42374dd6 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -43,9 +43,7 @@ class TestBrowserWindow : public BrowserWindow {
   virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE {}
   virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE {}
   virtual void SetStarredState(bool is_starred) OVERRIDE {}
-  virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE {}
-  virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE {}
-  virtual void ShowZoomBubble(int zoom_percent) OVERRIDE {}
+  virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE {}
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;