Cleanup AutocompleteInput and AutocompleteProvider Functions

chrome/browser/autocomplete/shortcuts_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_SHORTCUTS_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 34 matching lines @@
 
   // ShortcutsBackendObserver:
   virtual void OnShortcutsLoaded() OVERRIDE;
 
   // Performs the autocomplete matching and scoring.
   void GetMatches(const AutocompleteInput& input);
 
   // Returns an AutocompleteMatch corresponding to |shortcut|. Assigns it
   // |relevance| score in the process, and highlights the description and
   // contents against |input|, which should be the lower-cased version
-  // of the user's input. |input|, |fixed_up_input|, and
+  // of the user's input. |input|, |fixed_up_input_text|, and
   // |input_as_gurl| are used to decide what can be inlined.
   AutocompleteMatch ShortcutToACMatch(
       const history::ShortcutsDatabase::Shortcut& shortcut,
       int relevance,
       const AutocompleteInput& input,
-      const AutocompleteInput& fixed_up_input,
+      const base::string16& fixed_up_input_text,
       const GURL& input_as_gurl);
 
   // Returns a map mapping characters to groups of words from |text| that start
   // with those characters, ordered lexicographically descending so that longer
   // words appear before their prefixes (if any) within a particular
   // equal_range().
   static WordMap CreateWordMapForString(const base::string16& text);
 
   // Given |text| and a corresponding base set of classifications
   // |original_class|, adds ACMatchClassification::MATCH markers for all
@@ skipping 32 matching lines @@
                      int max_relevance);
 
   // The default max relevance unless overridden by a field trial.
   static const int kShortcutsProviderDefaultMaxRelevance;
 
   std::string languages_;
   bool initialized_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_