[Omnibox] fix size of entity image

This CL fixes a bug in sizing the entity images where they would be sized
too large if shown after an Answer result (such as weather). This
occurred because the old height for the answer result was being used in
the entity sizing.

Bug: None
Change-Id: Ia372c142a011657af150eb651403a61aeab2943d
Reviewed-on: https://chromium-review.googlesource.com/1024926Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552905}

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

@@ -293,7 +293,7 @@ void OmniboxSuggestionView::LayoutEntity() {
   int x = GetIconAlignmentOffset() + HorizontalPadding() +
           LocationBarView::GetBorderThicknessDip();
   int y = GetVerticalInsets(text_height_, is_answer_).top();
-  int image_edge_length = text_height_ + description_view_->GetLineHeight();
+  int image_edge_length = text_height_ * 2;
   image_view_->SetImageSize(gfx::Size(image_edge_length, image_edge_length));
   image_view_->SetBounds(x, y, image_edge_length, image_edge_length);
   x += image_edge_length + HorizontalPadding();