[Mac] Fix keyword hint spacing in RTL

chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
index 4bfbe28d068caf4c62fda62df4534b42277d0af1..affe1e33fc7e03b82e5af876de3f618c7620b15c 100644
--- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
@@ -31,6 +31,9 @@ const CGFloat kHintImagePadding = 1.0;
 // Should leave enough so that the user has space to edit things.
 const CGFloat kHintAvailableRatio = 2.0 / 3.0;
 
+// Extra padding at the right of the decoration.
+const CGFloat kHintTrailingPadding = 5.0;
+
 // Helper to convert |s| to an |NSString|, trimming whitespace at
 // ends.
 NSString* TrimAndConvert(const base::string16& s) {
@@ -103,7 +106,8 @@ CGFloat KeywordHintDecoration::GetWidthForSpace(CGFloat width) {
   CGFloat full_width =
       std::floor(GetLabelSize(hint_prefix_, attributes_).width + 0.5) +
       kHintImagePadding + image_width + kHintImagePadding +
-      std::floor(GetLabelSize(hint_suffix_, attributes_).width + 0.5);
+      std::floor(GetLabelSize(hint_suffix_, attributes_).width + 0.5) +
+      kHintTrailingPadding;
   if (full_width <= width * kHintAvailableRatio)
     return full_width;
 
@@ -119,6 +123,10 @@ void KeywordHintDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
   BOOL is_rtl = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   NSString* left_string = is_rtl ? hint_suffix_ : hint_prefix_;
   NSString* right_string = is_rtl ? hint_prefix_ : hint_suffix_;
+  if (is_rtl) {
+    frame.origin.x += kHintTrailingPadding;
+    frame.size.width -= kHintTrailingPadding;
+  }
 
   if (draw_full) {
     NSRect left_rect = frame;