[iOS] Don't stop loading when editing omnibox

This CL change the behaviour when editing a the omnibox to not stop the
load of the page when typing in the omnibox.

Bug: 818649, 1159147
Change-Id: If4e71aee5a8ad5367122058630a54039399d7040
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627490
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843091}

ios/chrome/browser/ui/browser_view/browser_view_controller.mm

@@ -397,8 +397,6 @@ NSString* const kBrowserViewControllerSnackbarCategory =
   // YES if Voice Search should be started when the new tab animation is
   // finished.
   BOOL _startVoiceSearchAfterNewTabAnimation;
-  // YES if a load was cancelled due to typing in the location bar.
-  BOOL _locationBarEditCancelledLoad;
   // YES if waiting for a foreground tab due to expectNewForegroundTab.
   BOOL _expectingForegroundTab;
 
@@ -4356,28 +4354,9 @@ NSString* const kBrowserViewControllerSnackbarCategory =
   [[OmniboxGeolocationController sharedInstance]
       locationBarDidResignFirstResponder:self.browserState];
 
-  // If a load was cancelled by an omnibox edit, but nothing is loading when
-  // editing ends (i.e., editing was cancelled), restart the cancelled load.
-  if (_locationBarEditCancelledLoad) {
-    _locationBarEditCancelledLoad = NO;
-
-    web::WebState* webState = self.currentWebState;
-    if (!_isShutdown && webState && ![self.helper isToolbarLoading:webState])
-      webState->GetNavigationManager()->Reload(web::ReloadType::NORMAL,
-                                               false /* check_for_repost */);
-  }
   [self.primaryToolbarCoordinator transitionToLocationBarFocusedState:NO];
 }
 
-- (void)locationBarBeganEdit {
-  // On handsets, if a page is currently loading it should be stopped.
-  if (![self canShowTabStrip] &&
-      [self.helper isToolbarLoading:self.currentWebState]) {
-    WebNavigationBrowserAgent::FromBrowser(self.browser)->StopLoading();
-    _locationBarEditCancelledLoad = YES;
-  }
-}
-
 - (LocationBarModel*)locationBarModel {
   return _locationBarModel.get();
 }

ios/chrome/browser/ui/browser_view/browser_view_controller_unittest.mm

@@ -224,22 +224,6 @@ TEST_F(BrowserViewControllerTest, TestWebStateSelected) {
   EXPECT_TRUE(ActiveWebState()->IsVisible());
 }
 
-// Verifies that editing the omnimbox while the page is loading will stop the
-// load on a handset, but not stop the load on a tablet.
-TEST_F(BrowserViewControllerTest,
-       TestLocationBarBeganEdit_whenPageLoadIsInProgress) {
-  // Have the TestLocationBarModel indicate that a page load is in progress.
-  id partialMock = OCMPartialMock(bvcHelper_);
-  OCMExpect([partialMock isToolbarLoading:static_cast<web::WebState*>(
-                                              [OCMArg anyPointer])])
-      .andReturn(YES);
-
-  // The tab should stop loading on iPhones.
-  [bvc_ locationBarBeganEdit];
-  if (!IsIPadIdiom())
-    EXPECT_FALSE(ActiveWebState()->IsLoading());
-}
-
 TEST_F(BrowserViewControllerTest, TestClearPresentedState) {
   EXPECT_CALL(*this, OnCompletionCalled());
   [bvc_

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

@@ -369,10 +369,6 @@
   [self.delegate locationBarDidResignFirstResponder];
 }
 
-- (void)locationBarBeganEdit {
-  [self.delegate locationBarBeganEdit];
-}
-
 - (web::WebState*)webState {
   return self.webStateList->GetActiveWebState();
 }

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

@@ -47,8 +47,6 @@ using variations::VariationsIdsProvider;
 }
 - (void)locationBarDidResignFirstResponder {
 }
-- (void)locationBarBeganEdit {
-}
 
 - (LocationBarModel*)locationBarModel {
   if (!_model) {

ios/chrome/browser/ui/omnibox/location_bar_delegate.h

@@ -17,7 +17,6 @@ class WebState;
 @protocol LocationBarDelegate
 - (void)locationBarHasBecomeFirstResponder;
 - (void)locationBarHasResignedFirstResponder;
-- (void)locationBarBeganEdit;
 - (web::WebState*)webState;
 - (LocationBarModel*)locationBarModel;
 @end

ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller_impl.h

@@ -38,7 +38,6 @@ class WebOmniboxEditControllerImpl : public WebOmniboxEditController {
       AutocompleteMatchType::Type match_type,
       base::TimeTicks match_selection_timestamp,
       bool destination_url_entered_without_scheme) override;
-  void OnInputInProgress(bool in_progress) override;
   void OnChanged() override;
   LocationBarModel* GetLocationBarModel() override;
   const LocationBarModel* GetLocationBarModel() const override;

ios/chrome/browser/ui/omnibox/web_omnibox_edit_controller_impl.mm

@@ -53,12 +53,6 @@ void WebOmniboxEditControllerImpl::OnAutocompleteAccept(
   }
 }
 
-void WebOmniboxEditControllerImpl::OnInputInProgress(bool in_progress) {
-  // TODO(crbug.com/818649): see if this is really used.
-  if (in_progress)
-    [delegate_ locationBarBeganEdit];
-}
-
 void WebOmniboxEditControllerImpl::OnChanged() {
   // Called when anything is changed. Since the Mediator already observes the
   // WebState for security status changes, no need to do anything.

ios/chrome/browser/ui/toolbar/toolbar_coordinator_delegate.h

@@ -17,8 +17,6 @@ class LocationBarModel;
 - (void)locationBarDidBecomeFirstResponder;
 // Called when the location bar loses keyboard focus.
 - (void)locationBarDidResignFirstResponder;
-// Called when the location bar receives a key press.
-- (void)locationBarBeganEdit;
 // Returns the location bar model.
 - (LocationBarModel*)locationBarModel;