Revert of Generating autocomplete results with and without word breaks in the Omnibox.

components/omnibox/browser/url_index_private_data.h

Index: components/omnibox/browser/url_index_private_data.h
diff --git a/components/omnibox/browser/url_index_private_data.h b/components/omnibox/browser/url_index_private_data.h
index 8d245c0e2f02fe2835d7957d70536469d62537d5..100692cd7b44e63de9bfbc2b01c3501a6e2bbd95 100644
--- a/components/omnibox/browser/url_index_private_data.h
+++ b/components/omnibox/browser/url_index_private_data.h
@@ -50,18 +50,19 @@ class URLIndexPrivateData
  public:
   URLIndexPrivateData();
 
-  // Given a |term_string|, scans the history index and returns a vector with
-  // all scored, matching history items. The |term_string| is broken down into
-  // individual terms (words), each of which must occur in the candidate
-  // history item's URL or page title for the item to qualify; however, the
-  // terms do not necessarily have to be adjacent. We also allow breaking
-  // |term_string| at |cursor_position| (if set). Once we have a set of
-  // candidates, they are filtered to ensure that all |term_string| terms, as
-  // separated by whitespace and the cursor (if set), occur within the
-  // candidate's URL or page title.  Scores are then calculated on no more than
-  // |kItemsToScoreLimit| candidates, as the scoring of such a large number of
-  // candidates may cause perceptible typing response delays in the omnibox.
-  // This is likely to occur for short omnibox terms such as 'h' and 'w' which
+  // Given a base::string16 in |term_string|, scans the history index and
+  // returns a vector with all scored, matching history items. The
+  // |term_string| is broken down into individual terms (words), each of which
+  // must occur in the candidate history item's URL or page title for the item
+  // to qualify; however, the terms do not necessarily have to be adjacent. We
+  // also allow breaking |term_string| at |cursor_position| (if
+  // set). Once we have a set of candidates, they are filtered to ensure
+  // that all |term_string| terms, as separated by whitespace and the
+  // cursor (if set), occur within the candidate's URL or page title.
+  // Scores are then calculated on no more than |kItemsToScoreLimit|
+  // candidates, as the scoring of such a large number of candidates may
+  // cause perceptible typing response delays in the omnibox. This is
+  // likely to occur for short omnibox terms such as 'h' and 'w' which
   // will be found in nearly all history candidates. Results are sorted by
   // descending score. The full results set (i.e. beyond the
   // |kItemsToScoreLimit| limit) will be retained and used for subsequent calls