views/location_bar: Eliminate TouchableLocationBarView.

chrome/browser/ui/views/location_bar/zoom_view.cc

Index: chrome/browser/ui/views/location_bar/zoom_view.cc
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc
index 2a1c39d679c9c5d6975b5aff5fcc37b62b75fa3a..53436bcaf1d2568df647b6631a9f1cdfcc6a8770 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.cc
+++ b/chrome/browser/ui/views/location_bar/zoom_view.cc
@@ -22,7 +22,7 @@ ZoomView::ZoomView(ToolbarModel* toolbar_model,
       location_bar_delegate_(location_bar_delegate) {
   set_accessibility_focusable(true);
   Update(NULL);
-  TouchableLocationBarView::Init(this);
+  LocationBarView::InitTouchableLocationBarView(this);
 }
 
 ZoomView::~ZoomView() {
@@ -80,10 +80,6 @@ void ZoomView::OnGestureEvent(ui::GestureEvent* event) {
   }
 }
 
-int ZoomView::GetBuiltInHorizontalPadding() const {
-  return GetBuiltInHorizontalPaddingImpl();
-}
-
 void ZoomView::ActivateBubble() {
   ZoomBubbleView::ShowBubble(location_bar_delegate_->GetWebContents(), false);
 }