Defocus the omnibox when switching tabs.

CL 905511 introduced a bug where previously BVC was defocusing the
omnibox by sending selectedTabChanged to the toolbar, but this was
broken.

Since the location bar now directly observes the webstate with its
mediator, use this to defocus omnibox when the webstate changes.

Bug: 813944
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ibc67faaae115032e0a3c6e6b5e3879d7e52f8f0f
Reviewed-on: https://chromium-review.googlesource.com/960663Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542817}

ios/chrome/browser/ui/location_bar/location_bar_consumer.h

@@ -12,6 +12,9 @@
 // text and the cursor position.
 - (void)updateOmniboxState;
 
+// Notifies consumer to defocus the omnibox (for example on tab change).
+- (void)defocusOmnibox;
+
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_CONSUMER_H_

ios/chrome/browser/ui/location_bar/location_bar_coordinator.mm

@@ -142,16 +142,6 @@ const int kLocationAuthorizationStatusCount = 4;
   return self.omniboxPopupCoordinator.hasResults;
 }
 
-#pragma mark - LocationBarConsumer
-
-- (void)updateOmniboxState {
-  if (!_locationBarController)
-    return;
-  _locationBarController->SetShouldShowHintText(
-      [self.delegate shouldDisplayHintText]);
-  _locationBarController->OnToolbarUpdated();
-}
-
 - (BOOL)showingOmniboxPopup {
   OmniboxViewIOS* omniboxViewIOS = static_cast<OmniboxViewIOS*>(
       _locationBarController.get()->GetLocationEntry());
@@ -178,6 +168,20 @@ const int kLocationAuthorizationStatusCount = 4;
   [self.locationBarView addContractOmniboxAnimations:animator];
 }
 
+#pragma mark - LocationBarConsumer
+
+- (void)updateOmniboxState {
+  if (!_locationBarController)
+    return;
+  _locationBarController->SetShouldShowHintText(
+      [self.delegate shouldDisplayHintText]);
+  _locationBarController->OnToolbarUpdated();
+}
+
+- (void)defocusOmnibox {
+  [self cancelOmniboxEdit];
+}
+
 #pragma mark - VoiceSearchControllerDelegate
 
 - (void)receiveVoiceSearchResult:(NSString*)result {

ios/chrome/browser/ui/location_bar/location_bar_mediator.mm

@@ -115,6 +115,7 @@
                      reason:(int)reason {
   DCHECK_EQ(_webStateList, webStateList);
   self.webState = newWebState;
+  [self.consumer defocusOmnibox];
 }
 
 #pragma mark - Setters

ios/chrome/browser/ui/location_bar/location_bar_mediator_unittest.mm

@@ -213,3 +213,15 @@ TEST_F(LocationBarMediatorTest, TestDidChangeVisibleSecurityState) {
 
   EXPECT_OCMOCK_VERIFY(consumer_);
 }
+
+// Test the omnibox is defocused when the active webstate is changed.
+TEST_F(LocationBarMediatorTest, TestChangeActiveWebState) {
+  mediator_.webStateList = web_state_list_.get();
+  SetUpActiveWebState();
+  mediator_.consumer = consumer_;
+
+  OCMExpect([consumer_ defocusOmnibox]);
+  web_state_list_->ActivateWebStateAt(1);
+
+  EXPECT_OCMOCK_VERIFY(consumer_);
+}