[omnibox] More correct OmniboxResultView::CalculatePreferredSize().

Even though the suggestion view and the keyword view take up the same space,
that doesn't mean the suggestion view is guaranteed to be at least as large as
the keyword view.  Use the max of the two sizes.

Bug: none
Change-Id: Ia08506e8ce2742ce09833930572c278c2ceb9909
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857652
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Kevin Bailey <krb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706241}

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

@@ -410,10 +410,10 @@ void OmniboxResultView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
 }
 
 gfx::Size OmniboxResultView::CalculatePreferredSize() const {
-  // The keyword_view_ is not added because keyword_view_ uses the same space as
-  // suggestion_view_. So the 'preferred' size is just the suggestion_view_
-  // size.
-  return suggestion_view_->CalculatePreferredSize();
+  gfx::Size size = suggestion_view_->GetPreferredSize();
+  if (keyword_view_->GetVisible())
+    size.SetToMax(keyword_view_->GetPreferredSize());
+  return size;
 }
 
 void OmniboxResultView::OnThemeChanged() {