Revert 242029 "Omnibox: Bug Fixes for Shortcuts Inlining"

trunk/src/chrome/browser/autocomplete/history_provider.h

Index: trunk/src/chrome/browser/autocomplete/history_provider.h
===================================================================
--- trunk/src/chrome/browser/autocomplete/history_provider.h	(revision 242105)
+++ trunk/src/chrome/browser/autocomplete/history_provider.h	(working copy)
@@ -18,6 +18,16 @@
  public:
   virtual void DeleteMatch(const AutocompleteMatch& match) OVERRIDE;
 
+ protected:
+  HistoryProvider(AutocompleteProviderListener* listener,
+                  Profile* profile,
+                  AutocompleteProvider::Type type);
+  virtual ~HistoryProvider();
+
+  // Finds and removes the match from the current collection of matches and
+  // backing data.
+  void DeleteMatchFromMatches(const AutocompleteMatch& match);
+
   // Fixes up user URL input to make it more possible to match against.  Among
   // many other things, this takes care of the following:
   // * Prepending file:// to file URLs
@@ -32,16 +42,6 @@
   // providers generally can't do anything with).
   static bool FixupUserInput(AutocompleteInput* input);
 
- protected:
-  HistoryProvider(AutocompleteProviderListener* listener,
-                  Profile* profile,
-                  AutocompleteProvider::Type type);
-  virtual ~HistoryProvider();
-
-  // Finds and removes the match from the current collection of matches and
-  // backing data.
-  void DeleteMatchFromMatches(const AutocompleteMatch& match);
-
   // Trims "http:" and up to two subsequent slashes from |url|.  Returns the
   // number of characters that were trimmed.
   // NOTE: For a view-source: URL, this will trim from after "view-source:" and