Move ShortcutsDatabase out of history namespace

ShortcutsDatabase is now in //chrome/browser/autocomplete and thus should
not be in the history namespace, renaming it.

Sort files in //chrome/chrome_browser.gypi too.

BUG=None
[email protected]

Review URL: https://codereview.chromium.org/961293002

Cr-Commit-Position: refs/heads/master@{#318500}
diff --git a/chrome/browser/autocomplete/shortcuts_provider.h b/chrome/browser/autocomplete/shortcuts_provider.h
index 20ae621..af314a07 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.h
+++ b/chrome/browser/autocomplete/shortcuts_provider.h
@@ -55,7 +55,7 @@
   // the user's input. |input| and |fixed_up_input_text| are used to decide
   // what can be inlined.
   AutocompleteMatch ShortcutToACMatch(
-      const history::ShortcutsDatabase::Shortcut& shortcut,
+      const ShortcutsDatabase::Shortcut& shortcut,
       int relevance,
       const AutocompleteInput& input,
       const base::string16& fixed_up_input_text);
@@ -99,7 +99,7 @@
       ShortcutsBackend* backend);
 
   int CalculateScore(const base::string16& terms,
-                     const history::ShortcutsDatabase::Shortcut& shortcut,
+                     const ShortcutsDatabase::Shortcut& shortcut,
                      int max_relevance);
 
   // The default max relevance unless overridden by a field trial.