[ios] Fix accessory view layout for omnibox popup

Bug: 795683
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Iab78eeda08a1de8a56a662f8a0b2b4d4fe8696da
Reviewed-on: https://chromium-review.googlesource.com/847429Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526922}

ios/chrome/browser/ui/omnibox/omnibox_popup_row.mm

@@ -107,16 +107,17 @@ const CGFloat kAppendButtonSize = 48.0;
 - (void)layoutAccessoryViews {
   LayoutRect imageViewLayout = LayoutRectMake(
       IsCompactTablet() ? kLeadingPaddingIpadCompact : kLeadingPaddingIpad,
-      CGRectGetWidth(self.bounds),
+      CGRectGetWidth(self.contentView.bounds),
       floor((_rowHeight - kImageDimensionLength) / 2), kImageDimensionLength,
       kImageDimensionLength);
   _imageView.frame = LayoutRectGetRect(imageViewLayout);
 
-  LayoutRect trailingAccessoryLayout = LayoutRectMake(
-      CGRectGetWidth(self.bounds) - kAppendButtonSize -
-          kAppendButtonTrailingMargin,
-      CGRectGetWidth(self.bounds), floor((_rowHeight - kAppendButtonSize) / 2),
-      kAppendButtonSize, kAppendButtonSize);
+  LayoutRect trailingAccessoryLayout =
+      LayoutRectMake(CGRectGetWidth(self.contentView.bounds) -
+                         kAppendButtonSize - kAppendButtonTrailingMargin,
+                     CGRectGetWidth(self.contentView.bounds),
+                     floor((_rowHeight - kAppendButtonSize) / 2),
+                     kAppendButtonSize, kAppendButtonSize);
   _appendButton.frame = LayoutRectGetRect(trailingAccessoryLayout);
 }