Omnibox: Bug Fixes for Shortcuts Inlining

chrome/browser/autocomplete/history_provider.h

Index: chrome/browser/autocomplete/history_provider.h
diff --git a/chrome/browser/autocomplete/history_provider.h b/chrome/browser/autocomplete/history_provider.h
index 705ab4cbf7f8b055536ad2e85a37f9395bb35078..7144fb9b4ea7e1b5e2e43b5c1f97c4090c291ba1 100644
--- a/chrome/browser/autocomplete/history_provider.h
+++ b/chrome/browser/autocomplete/history_provider.h
@@ -18,16 +18,6 @@ class HistoryProvider : public AutocompleteProvider {
  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
@@ -42,6 +32,16 @@ class HistoryProvider : public AutocompleteProvider {
   // providers generally can't do anything with).
   static bool FixupUserInput(AutocompleteInput* input);

[Mark P, 2013/12/17 22:52:40]

This is a simple cut-and-paste of FixupUserInput from the protected section to
the public section.  The diff highlighting is icky.

 
+ 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