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

components/omnibox/browser/url_index_private_data.h

 // Copyright (c) 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.
 
 #ifndef COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_
 #define COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_
 
 #include <stddef.h>
 
 #include <set>
@@ skipping 32 matching lines @@
 // this class is for exclusive use by the InMemoryURLIndex class there should
 // be no calls from any other class.
 //
 // All public member functions are called on the main thread unless otherwise
 // annotated.
 class URLIndexPrivateData
     : public base::RefCountedThreadSafe<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
   // to this function. In total, |max_matches| of items will be returned in the
   // |ScoredHistoryMatches| vector.
   ScoredHistoryMatches HistoryItemsForTerms(
       base::string16 term_string,
       size_t cursor_position,
       size_t max_matches,
       bookmarks::BookmarkModel* bookmark_model,
@@ skipping 311 matching lines @@
   int saved_cache_version_;
 
   // Used for unit testing only. Records the number of candidate history items
   // at three stages in the index searching process.
   size_t pre_filter_item_count_;    // After word index is queried.
   size_t post_filter_item_count_;   // After trimming large result set.
   size_t post_scoring_item_count_;  // After performing final filter/scoring.
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_