[omnibox] [rich-autocompletion] Fix omnibox width when empty.

This CL fixes a typo introduced in crrev.com/c/2324212 that would
prevent the omnibox's width being updated in |LocationBarView::Layout()|
if:
- RichAutocompletionShowAdditionalText was enabled (default)
- RichAutocompletionTwoLineOmnibox was disabled (default)
- The omnibox was empty

This resulted in
- The hint 'Search Google or type a URL' when the omnibox is cleared and
blurred or when on the NTP.
- The cursor being misplaced when entering keyword mode which clears the
user text.

Bug: 1128094, 1062446
Change-Id: I073a9c75db1266d02a192675149211bad7615a8d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410591Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: manuk hovanesian <manukh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807087}

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

@@ -650,33 +650,32 @@ void LocationBarView::Layout() {
 
   // If rich autocompletion is enabled, split |location_bounds| for the
   // |omnibox_view_| and |omnibox_additional_text_view_|.
-  if (OmniboxFieldTrial::RichAutocompletionShowAdditionalText()) {
-    if (OmniboxFieldTrial::RichAutocompletionTwoLineOmnibox()) {
-      // Split vertically.
-      auto omnibox_bounds = location_bounds;
-      omnibox_bounds.set_height(location_bounds.height() / 2);
-      omnibox_view_->SetBoundsRect(omnibox_bounds);
-      auto omnibox_additional_text_bounds = omnibox_bounds;
-      omnibox_additional_text_bounds.set_x(location_bounds.x() + 3);
-      omnibox_additional_text_bounds.set_y(omnibox_bounds.bottom());
-      omnibox_additional_text_view_->SetBoundsRect(
-          omnibox_additional_text_bounds);
-
-    } else if (!omnibox_view_->GetText().empty()) {
-      // Split horizontally.
-      auto omnibox_bounds = location_bounds;
-      omnibox_bounds.set_width(std::min(
-          omnibox_view_->GetUnelidedTextWidth() + 10, location_bounds.width()));
-      omnibox_view_->SetBoundsRect(omnibox_bounds);
-      auto omnibox_additional_text_bounds = location_bounds;
-      omnibox_additional_text_bounds.set_x(omnibox_bounds.x() +
-                                           omnibox_bounds.width());
-      omnibox_additional_text_bounds.set_width(
-          std::max(location_bounds.width() - omnibox_bounds.width(), 0));
-      omnibox_additional_text_view_->SetBoundsRect(
-          omnibox_additional_text_bounds);
-    }
-
+  if (OmniboxFieldTrial::RichAutocompletionShowAdditionalText() &&
+      OmniboxFieldTrial::RichAutocompletionTwoLineOmnibox()) {
+    // Split vertically.
+    auto omnibox_bounds = location_bounds;
+    omnibox_bounds.set_height(location_bounds.height() / 2);
+    omnibox_view_->SetBoundsRect(omnibox_bounds);
+    auto omnibox_additional_text_bounds = omnibox_bounds;
+    omnibox_additional_text_bounds.set_x(location_bounds.x() + 3);
+    omnibox_additional_text_bounds.set_y(omnibox_bounds.bottom());
+    omnibox_additional_text_view_->SetBoundsRect(
+        omnibox_additional_text_bounds);
+
+  } else if (OmniboxFieldTrial::RichAutocompletionShowAdditionalText() &&
+             !omnibox_view_->GetText().empty()) {
+    // Split horizontally.
+    auto omnibox_bounds = location_bounds;
+    omnibox_bounds.set_width(std::min(
+        omnibox_view_->GetUnelidedTextWidth() + 10, location_bounds.width()));
+    omnibox_view_->SetBoundsRect(omnibox_bounds);
+    auto omnibox_additional_text_bounds = location_bounds;
+    omnibox_additional_text_bounds.set_x(omnibox_bounds.x() +
+                                         omnibox_bounds.width());
+    omnibox_additional_text_bounds.set_width(
+        std::max(location_bounds.width() - omnibox_bounds.width(), 0));
+    omnibox_additional_text_view_->SetBoundsRect(
+        omnibox_additional_text_bounds);
   } else {
     omnibox_view_->SetBoundsRect(location_bounds);
   }