Remove unused parameter |opt_split| in __gCrWeb.findInPage.highlightWord.

The parameter |opt_split| in __gCrWeb.findInPage.highlightWord is always
false. Since we don't support AND search in FindInPage, this parameter
should be removed. This is a preparation work for fixing the bug.

Bug: 228585
Change-Id: I4c0bd3381c7dc0f5012fa4c161814e52a5a1ec97
Reviewed-on: https://chromium-review.googlesource.com/c/1341834Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609273}

ios/chrome/browser/find_in_page/find_in_page_js_unittest.mm

@@ -23,9 +23,10 @@
 
 namespace {
 
-// JavaScript invocation to search for 'foo' (for 1000 milliseconds).
-NSString* kJavaScriptToSearchForFoo =
-    @"__gCrWeb.findInPage.highlightWord('foo', false, 1000)";
+// JavaScript invocation format string, with one NSString placeholder for the
+// search target and timeout set to 1000ms.
+NSString* kJavaScriptSearchCallFormat =
+    @"__gCrWeb.findInPage.highlightWord('%@', 1000)";
 
 // Other JavaScript functions invoked by the tests.
 NSString* kJavaScriptIncrementIndex = @"__gCrWeb.findInPage.incrementIndex()";
@@ -97,7 +98,8 @@ class FindInPageJsTest : public ChromeWebTest {
 
     // Search for 'foo'. Performing the search sets the index to point to the
     // first visible occurrence of 'foo'.
-    ExecuteJavaScript(kJavaScriptToSearchForFoo);
+    ExecuteJavaScript(
+        [NSString stringWithFormat:kJavaScriptSearchCallFormat, @"foo"]);
     AssertJavaScriptValue(kJavaScriptIndex, 1);
     AssertJavaScriptValue(kJavaScriptSpansLength, kNumberOfFoosInHtml);
   }
@@ -194,7 +196,8 @@ TEST_F(FindInPageJsTest, NoneVisible) {
 
   // Search for 'foo'. Performing the search sets the index to point to 0 since
   // there are no visible occurrences of 'foo'.
-  ExecuteJavaScript(kJavaScriptToSearchForFoo);
+  ExecuteJavaScript(
+      [NSString stringWithFormat:kJavaScriptSearchCallFormat, @"foo"]);
   AssertJavaScriptValue(kJavaScriptIndex, 0);
   AssertJavaScriptValue(kJavaScriptSpansLength, 6);
 
@@ -218,9 +221,8 @@ TEST_F(FindInPageJsTest, SearchForNonAscii) {
 
   // Search for the non-Ascii value. Performing the search sets the index to
   // point to the first visible occurrence of the non-Ascii.
-  NSString* result = ExecuteJavaScript([NSString
-      stringWithFormat:@"__gCrWeb.findInPage.highlightWord('%@', false, 1000)",
-                       kNonAscii]);
+  NSString* result = ExecuteJavaScript(
+      [NSString stringWithFormat:kJavaScriptSearchCallFormat, kNonAscii]);
   ASSERT_TRUE(result);
   AssertJavaScriptValue(kJavaScriptIndex, 0);
   AssertJavaScriptValue(kJavaScriptSpansLength, 1);
@@ -236,8 +238,8 @@ TEST_F(FindInPageJsTest, SearchForWhitespace) {
 
   // Search for space. Performing the search sets the index to
   // point to the first visible occurrence of the whitespace.
-  NSString* result =
-      ExecuteJavaScript(@"__gCrWeb.findInPage.highlightWord(' ', false, 1000)");
+  NSString* result = ExecuteJavaScript(
+      [NSString stringWithFormat:kJavaScriptSearchCallFormat, @" "]);
   ASSERT_TRUE(result);
   AssertJavaScriptValue(kJavaScriptIndex, 0);
   AssertJavaScriptValue(kJavaScriptSpansLength, 8);

ios/chrome/browser/find_in_page/js_findinpage_manager.mm

@@ -30,7 +30,7 @@ NSString* const kFindInPageInit = @"window.__gCrWeb.findInPage && "
 // to spend any time at runtime to format this constant into another constant.
 NSString* const kFindInPageVerbatim =
     @"window.__gCrWeb.findInPage && "
-     "window.__gCrWeb.findInPage.highlightWord(%@, false, 100.0);";
+     "window.__gCrWeb.findInPage.highlightWord(%@, 100.0);";
 
 // The timeout of 100ms is hardcoded into this string so we don't have
 // to spend any time at runtime to format this constant into another constant.

ios/chrome/browser/find_in_page/resources/find_in_page.js

@@ -107,27 +107,10 @@ function getCurrentSpan_() {
 /**
  * Creates the regex needed to find the text.
  * @param {string} findText Phrase to look for.
- * @param {boolean} opt_split True to split up the phrase.
  * @return {RegExp} regex needed to find the text.
  */
-function getRegex_(findText, opt_split) {
-  let regexString = '';
-  if (opt_split) {
-    let words = [];
-    let split = findText.split(' ');
-    for (let i = 0; i < split.length; i++) {
-      words.push(escapeRegex_(split[i]));
-    }
-    let joinedWords = words.join('|');
-    regexString = '(' +
-        // Match at least one word.
-        '\\b(?:' + joinedWords + ')' +
-        // Include zero or more additional words separated by whitespace.
-        '(?:\\s*\\b(?:' + joinedWords + '))*' +
-        ')';
-  } else {
-    regexString = '(' + escapeRegex_(findText) + ')';
-  }
+function getRegex_(findText) {
+  let regexString = '(' + escapeRegex_(findText) + ')';
   return new RegExp(regexString, 'ig');
 };
 
@@ -153,14 +136,11 @@ __gCrWeb.findInPage.overTime = function() {
 /**
  * Looks for a phrase in the DOM.
  * @param {string} findText Phrase to look for like "ben franklin".
- * @param {boolean} opt_split True to split up the words and look for any
- *     of them.  False to require the full phrase to be there.
- *     Undefined will try the full phrase, and if nothing is found do the split.
  * @param {number} timeout Maximum time to run.
  * @return {string} How many results there are in the page in the form of
        [highlightedWordsCount, [index, pageLocationX, pageLocationY]].
  */
-__gCrWeb.findInPage.highlightWord = function(findText, opt_split, timeout) {
+__gCrWeb.findInPage.highlightWord = function(findText, timeout) {
   if (__gCrWeb.findInPage.spans && __gCrWeb.findInPage.spans.length) {
     // Clean up a previous run.
     clearHighlight_();
@@ -193,7 +173,7 @@ __gCrWeb.findInPage.highlightWord = function(findText, opt_split, timeout) {
   __gCrWeb.findInPage.replacementsIndex = 0;
   __gCrWeb.findInPage.replacementNewNodesIndex = 0;
 
-  __gCrWeb.findInPage.regex = getRegex_(findText, opt_split);
+  __gCrWeb.findInPage.regex = getRegex_(findText);
 
   searchInProgress_ = true;
 
@@ -209,7 +189,6 @@ __gCrWeb.findInPage.highlightWord = function(findText, opt_split, timeout) {
                     whether the text was found and int idicates text position.
  */
 __gCrWeb.findInPage.pumpSearch = function(timeout) {
-  let opt_split = false;
   // TODO(justincohen): It would be better if this DCHECKed.
   if (searchInProgress_ == false)
     return NO_RESULTS;
@@ -335,25 +314,11 @@ __gCrWeb.findInPage.pumpSearch = function(timeout) {
 
   searchInProgress_ = false;
 
-  // Try again flow.
-  // If opt_split is true, we are done since we won't do any better.
-  // If opt_split is false, they were explicit about wanting the full thing
-  // so do not try with a split.
-  // If opt_split is undefined and we did not find an answer, go ahead and try
-  // splitting the terms.
-  if (__gCrWeb.findInPage.spans.length == 0 && opt_split === undefined) {
-    // Try to be more aggressive:
-    return __gCrWeb.findInPage.highlightWord(findText, true);
+  let pos = __gCrWeb.findInPage.goNext();
+  if (pos) {
+    return '[' + __gCrWeb.findInPage.visibleFound + ',' + pos + ']';
   } else {
-    let pos = __gCrWeb.findInPage.goNext();
-    if (pos) {
-      return '[' + __gCrWeb.findInPage.visibleFound + ',' + pos + ']';
-    } else if (opt_split === undefined) {
-      // Nothing visible, go ahead and be more aggressive.
-      return __gCrWeb.findInPage.highlightWord(findText, true);
-    } else {
-      return NO_RESULTS;
-    }
+    return NO_RESULTS;
   }
 };