Several cleanup items, and one visible change:

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

Index: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc	(revision 202226)
+++ chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc	(working copy)
@@ -18,12 +18,10 @@
 // Amount of padding at the edges of the bubble.
 //
 // This can't be statically initialized because
-// LocationBarView::GetEdgeItemPadding() depends on whether we are
-// using desktop or touch layout, and this in turn depends on the
-// command line.
+// LocationBarView::GetItemPadding() depends on whether we are using desktop or
+// touch layout, and this in turn depends on the command line.
 int GetBubbleOuterPadding() {
-  return LocationBarView::GetEdgeItemPadding() -
-      LocationBarView::kBubblePadding;
+  return LocationBarView::GetItemPadding() - LocationBarView::kBubblePadding;
 }
 }  // namespace