[ios] Moves the Find in Page APIs into FindTabHelper.

ios/chrome/browser/ui/browser_view_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 277 matching lines @@
     return true;
   std::string url_host = url.host();
   return url_host != kChromeUIHistoryHost &&
          url_host != kChromeUIHistoryFrameHost;
 }
 
 // Temporary key to use when storing native controllers vended to tabs before
 // they are added to the tab model.
 NSString* const kNativeControllerTemporaryKey = @"NativeControllerTemporaryKey";
 
-// Helper function to return the FindInPageController for the given |tab|.  If
-// |tab| is nullptr or has no FindTabHelper, returns nil.
-FindInPageController* GetFindInPageController(Tab* tab) {
-  if (!tab) {
-    return nil;
-  }
-  FindTabHelper* helper = FindTabHelper::FromWebState(tab.webState);
-  if (!helper) {
-    return nil;
-  }
-  return helper->GetController();
-}
-
-}  // anonymous namespace
+}  // namespace
 
 @interface BrowserViewController ()<AppRatingPromptDelegate,
                                     ContextualSearchControllerDelegate,
                                     ContextualSearchPanelMotionObserver,
                                     CRWNativeContentProvider,
                                     CRWWebStateDelegate,
                                     DialogPresenterDelegate,
                                     FullScreenControllerDelegate,
                                     KeyCommandsPlumbing,
                                     MFMailComposeViewControllerDelegate,
@@ skipping 766 matching lines @@
   Tab* tab = [_model currentTab];
   // TODO(shreyasv): Make it so the URL returned by the tab is always valid and
   // remove check on net::NSURLWithGURL(tab.url) ( http://crbug.com/400999 ).
   return tab && !tab.url.SchemeIs(kChromeUIScheme) &&
          net::NSURLWithGURL(tab.url);
 }
 
 - (BOOL)canShowFindBar {
   // Make sure web controller can handle find in page.
   Tab* tab = [_model currentTab];
-  FindInPageController* controller = GetFindInPageController(tab);
-  if (![controller canFindInPage])
+  if (!tab) {
     return NO;
+  }
 
-  // Don't show twice.
-  if (controller.findInPageModel.enabled)
-    return NO;
-
-  return YES;
+  auto* helper = FindTabHelper::FromWebState(tab.webState);
+  return (helper && helper->CurrentPageSupportsFindInPage() &&
+          !helper->IsFindUIActive());
 }
 
 - (web::UserAgentType)userAgentType {
   web::WebState* webState = [_model currentTab].webState;
   if (!webState)
     return web::UserAgentType::NONE;
   web::NavigationItem* visibleItem =
       webState->GetNavigationManager()->GetVisibleItem();
   if (!visibleItem)
     return web::UserAgentType::NONE;
@@ skipping 351 matching lines @@
                         name:kTabModelNewTabWillOpenNotification
                       object:_model];
 }
 
 - (void)pageLoadStarting:(NSNotification*)notify {
   Tab* tab = notify.userInfo[kTabModelTabKey];
   DCHECK(tab && ([_model indexOfTab:tab] != NSNotFound));
   // Hide find bar when navigating to a new page.
   [self hideFindBarWithAnimation:NO];
 
-  FindInPageController* controller = GetFindInPageController(tab);
-  controller.findInPageModel.enabled = NO;
-
   if (tab == [_model currentTab]) {
     // TODO(pinkerton): Fill in here about hiding the forward button on
     // navigation.
   }
 }
 
 - (void)pageLoadStarted:(NSNotification*)notify {
   Tab* tab = notify.userInfo[kTabModelTabKey];
   DCHECK(tab);
   if (tab == [_model currentTab]) {
@@ skipping 432 matching lines @@
 
   if (tab.isPrerenderTab && !_toolbarModelIOS->IsLoading())
     [_toolbarController showPrerenderingAnimation];
 
   // Also update the loading state for the tools menu (that is really an
   // extension of the toolbar on the iPhone).
   if (!IsIPadIdiom())
     [[_toolbarController toolsPopupController]
         setIsTabLoading:_toolbarModelIOS->IsLoading()];
 
-  FindInPageController* controller = GetFindInPageController(tab);
-  if (controller.findInPageModel.enabled) {
+  auto* findHelper = FindTabHelper::FromWebState(tab.webState);
+  if (findHelper && findHelper->IsFindUIActive()) {
     [self showFindBarWithAnimation:NO
                         selectText:YES
                        shouldFocus:[_findBarController isFocused]];
   }
 
   // Hide the toolbar if displaying phone NTP.
   if (!IsIPadIdiom()) {
     web::NavigationItem* item = [tab navigationManager]->GetVisibleItem();
     BOOL hideToolbar = NO;
     if (item) {
@@ skipping 1945 matching lines @@
   return card;
 }
 
 #pragma mark - Command Handling
 
 - (IBAction)chromeExecuteCommand:(id)sender {
   NSInteger command = [sender tag];
 
   if (!_model || !_browserState)
     return;
+  Tab* currentTab = [_model currentTab];
 
   switch (command) {
     case IDC_BACK:
       [[_model currentTab] goBack];
       break;
     case IDC_BOOKMARK_PAGE:
       [self initializeBookmarkInteractionController];
       [_bookmarkInteractionController
           presentBookmarkForTab:[_model currentTab]
             currentlyBookmarked:_toolbarModelIOS->IsCurrentTabBookmarkedByUser()
                          inView:[_toolbarController bookmarkButtonView]
                      originRect:[_toolbarController bookmarkButtonAnchorRect]];
       break;
     case IDC_CLOSE_TAB:
       [self closeCurrentTab];
       break;
     case IDC_FIND:
       [self initFindBarForTab];
       break;
     case IDC_FIND_NEXT: {
-      FindInPageController* findInPageController =
-          GetFindInPageController([_model currentTab]);
+      DCHECK(currentTab);
       // TODO(crbug.com/603524): Reshow find bar if necessary.
-      [findInPageController findNextStringInPageWithCompletionHandler:^{
-        FindInPageModel* model = findInPageController.findInPageModel;
-        [_findBarController updateResultsCount:model];
-      }];
+      FindTabHelper::FromWebState(currentTab.webState)
+          ->ContinueFinding(FindTabHelper::FORWARD, ^(FindInPageModel* model) {
+            [_findBarController updateResultsCount:model];
+          });
       break;
     }
     case IDC_FIND_PREVIOUS: {
-      FindInPageController* findInPageController =
-          GetFindInPageController([_model currentTab]);
+      DCHECK(currentTab);
       // TODO(crbug.com/603524): Reshow find bar if necessary.
-      [findInPageController findPreviousStringInPageWithCompletionHandler:^{
-        FindInPageModel* model = findInPageController.findInPageModel;
-        [_findBarController updateResultsCount:model];
-      }];
+      FindTabHelper::FromWebState(currentTab.webState)
+          ->ContinueFinding(FindTabHelper::REVERSE, ^(FindInPageModel* model) {
+            [_findBarController updateResultsCount:model];
+          });
       break;
     }
     case IDC_FIND_CLOSE:
       [self closeFindInPage];
       break;
     case IDC_FIND_UPDATE:
       [self searchFindInPage];
       break;
     case IDC_FORWARD:
       [[_model currentTab] goForward];
@@ skipping 191 matching lines @@
   [_bookmarkInteractionController dismissSnackbar];
   [_toolbarController cancelOmniboxEdit];
   [_dialogPresenter cancelAllDialogs];
   [self hidePageInfoPopupForView:nil];
   if (_voiceSearchController)
     _voiceSearchController->DismissMicPermissionsHelp();
 
   Tab* currentTab = [_model currentTab];
   [currentTab dismissModals];
 
-  FindInPageController* findInPageController =
-      GetFindInPageController(currentTab);
-  [findInPageController disableFindInPageWithCompletionHandler:^{
-    [self updateFindBar:NO shouldFocus:NO];
-  }];
+  if (currentTab) {
+    auto* findHelper = FindTabHelper::FromWebState(currentTab.webState);
+    if (findHelper) {
+      findHelper->StopFinding(^{
+        [self updateFindBar:NO shouldFocus:NO];
+      });
+    }
+  }
 
   [_contextualSearchController movePanelOffscreen];
   [_paymentRequestManager cancelRequest];
   [_printController dismissAnimated:YES];
   _printController.reset();
   [_toolbarController dismissToolsMenuPopup];
   [_contextMenuCoordinator stop];
   [self dismissRateThisAppDialog];
 
   [_contentSuggestionsCoordinator stop];
@@ skipping 84 matching lines @@
 // Create find bar controller and pass it to the web controller.
 - (void)initFindBarForTab {
   if (!self.canShowFindBar)
     return;
 
   if (!_findBarController)
     _findBarController.reset(
         [[FindBarControllerIOS alloc] initWithIncognito:_isOffTheRecord]);
 
   Tab* tab = [_model currentTab];
-  FindInPageController* controller = GetFindInPageController(tab);
-  DCHECK(!controller.findInPageModel.enabled);
-  controller.findInPageModel.enabled = YES;
+  DCHECK(tab);
+  auto* helper = FindTabHelper::FromWebState(tab.webState);
+  DCHECK(!helper->IsFindUIActive());
+  helper->SetFindUIActive(true);
   [self showFindBarWithAnimation:YES selectText:YES shouldFocus:YES];
 }
 
 - (void)searchFindInPage {
-  FindInPageController* findInPageController =
-      GetFindInPageController([_model currentTab]);
+  DCHECK([_model currentTab]);
+  auto* helper = FindTabHelper::FromWebState([_model currentTab].webState);
   base::WeakNSObject<BrowserViewController> weakSelf(self);
-  [findInPageController findStringInPage:[_findBarController searchTerm]
-                       completionHandler:^{
-                         FindInPageModel* model =
-                             findInPageController.findInPageModel;
+  helper->StartFinding([_findBarController searchTerm],
+                       ^(FindInPageModel* model) {
                          [_findBarController updateResultsCount:model];
-                       }];
+                       });
+
   if (!_isOffTheRecord)
-    [findInPageController saveSearchTerm];
+    helper->PersistSearchTerm();
 }
 
 - (void)closeFindInPage {
   base::WeakNSObject<BrowserViewController> weakSelf(self);
-  FindInPageController* findInPageController =
-      GetFindInPageController([_model currentTab]);
-  [findInPageController disableFindInPageWithCompletionHandler:^{
-    [weakSelf updateFindBar:NO shouldFocus:NO];
-  }];
+  Tab* currentTab = [_model currentTab];
+  if (currentTab) {
+    FindTabHelper::FromWebState(currentTab.webState)->StopFinding(^{
+      [weakSelf updateFindBar:NO shouldFocus:NO];
+    });
+  }
 }
 
 - (void)updateFindBar:(BOOL)initialUpdate shouldFocus:(BOOL)shouldFocus {
-  FindInPageController* findInPageController =
-      GetFindInPageController([_model currentTab]);
-  FindInPageModel* model = findInPageController.findInPageModel;
-  if (model.enabled) {
+  DCHECK([_model currentTab]);
+  auto* helper = FindTabHelper::FromWebState([_model currentTab].webState);
+  if (helper && helper->IsFindUIActive()) {
     if (initialUpdate && !_isOffTheRecord) {
-      [findInPageController restoreSearchTerm];
+      helper->RestoreSearchTerm();
     }
 
     [self setFramesForHeaders:[self headerViews]
                      atOffset:[self currentHeaderOffset]];
-    [_findBarController updateView:model
+    [_findBarController updateView:helper->GetFindResult()
                      initialUpdate:initialUpdate
                     focusTextfield:shouldFocus];
   } else {
     [self hideFindBarWithAnimation:YES];
   }
 }
 
 - (void)showAllBookmarks {
   DCHECK(self.visible || self.dismissingModal);
   GURL URL(kChromeUIBookmarksURL);
@@ skipping 780 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end