Cleanup AutocompleteInput and AutocompleteProvider Functions

chrome/browser/autocomplete/bookmark_provider.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 CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
 
 #include <string>
 
 #include "chrome/browser/autocomplete/autocomplete_input.h"
@@ skipping 33 matching lines @@
 
   virtual ~BookmarkProvider();
 
   // Performs the actual matching of |input| over the bookmarks and fills in
   // |matches_|.
   void DoAutocomplete(const AutocompleteInput& input);
 
   // Compose an AutocompleteMatch based on |match| that has 1) the URL of
   // |match|'s bookmark, and 2) the bookmark's title, not the URL's page
   // title, as the description.  |input| is used to compute the match's
-  // inline_autocompletion.  |fixed_up_input| is used in that way as well;
+  // inline_autocompletion.  |fixed_up_input_text| is used in that way as well;
   // it's passed separately so this function doesn't have to compute it.
   AutocompleteMatch BookmarkMatchToACMatch(
       const AutocompleteInput& input,
-      const AutocompleteInput& fixed_up_input,
+      const base::string16& fixed_up_input_text,
       const BookmarkMatch& match);
 
   // Converts |positions| into ACMatchClassifications and returns the
   // classifications. |text_length| is used to determine the need to add an
   // 'unhighlighted' classification span so the tail of the source string
   // properly highlighted.
   static ACMatchClassifications ClassificationsFromMatch(
       const query_parser::Snippet::MatchPositions& positions,
       size_t text_length,
       bool is_url);
 
   BookmarkModel* bookmark_model_;
 
   // True if we should use matches in the URL for scoring.
   const bool score_using_url_matches_;
 
   // Languages used during the URL formatting.
   std::string languages_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_