views/location_bar: Eliminate TouchableLocationBarView.

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

Index: chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
index b148c8ec39fcf19b1adfffdbc7282fea38fb4958..4bb9cca3ba058331b4f6f49c528eae1dfcdde506 100644
--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ -14,7 +15,7 @@ PageActionWithBadgeView::PageActionWithBadgeView(
     PageActionImageView* image_view) {
   image_view_ = image_view;
   AddChildView(image_view_);
-  TouchableLocationBarView::Init(this);
+  LocationBarView::InitTouchableLocationBarChildView(this);
 }
 
 void PageActionWithBadgeView::GetAccessibleState(
@@ -27,10 +28,6 @@ gfx::Size PageActionWithBadgeView::GetPreferredSize() {
                    extensions::IconsInfo::kPageActionIconMaxSize);
 }
 
-int PageActionWithBadgeView::GetBuiltInHorizontalPadding() const {
-  return GetBuiltInHorizontalPaddingImpl();
-}
-
 void PageActionWithBadgeView::Layout() {
   // We have 25 pixels of vertical space in the Omnibox to play with, so even
   // sized icons (such as 16x16) have either a 5 or a 4 pixel whitespace