iPhone toolbar behave the same in portrait and landscape

This CL changes the toolbar so when the location bar is focused in
iPhone landscape, the cancel button is shown, as it is done in
portrait.

Bug: 847847
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I351d166e52d80975579bf6c74fd44230543b4ce1
Reviewed-on: https://chromium-review.googlesource.com/1107634
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568852}

ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_coordinator.mm

@@ -119,8 +119,8 @@
 - (void)transitionToLocationBarFocusedState:(BOOL)focused {
   [self.orchestrator
       transitionToStateOmniboxFocused:focused
-                      toolbarExpanded:focused &&
-                                      IsSplitToolbarMode(self.viewController)
+                      toolbarExpanded:focused && !IsRegularXRegularSizeClass(
+                                                     self.viewController)
                              animated:YES];
 }
 
@@ -133,7 +133,8 @@
   [self.orchestrator
       transitionToStateOmniboxFocused:omniboxFocused
                       toolbarExpanded:omniboxFocused &&
-                                      IsSplitToolbarMode(self.viewController)
+                                      !IsRegularXRegularSizeClass(
+                                          self.viewController)
                              animated:NO];
 }