Revert of Handle Search suggest subtypes for Shortcuts DB

chrome/browser/autocomplete/shortcuts_backend.h

Index: chrome/browser/autocomplete/shortcuts_backend.h
diff --git a/chrome/browser/autocomplete/shortcuts_backend.h b/chrome/browser/autocomplete/shortcuts_backend.h
index 64f3bcc5f6434dd9cf7c8990fe3120b77bcec31b..0e89d9a908fd8f19a26424ed1b7e433cf521633f 100644
--- a/chrome/browser/autocomplete/shortcuts_backend.h
+++ b/chrome/browser/autocomplete/shortcuts_backend.h
@@ -80,7 +80,6 @@
   friend class base::RefCountedThreadSafe<ShortcutsBackend>;
   friend class ShortcutsProviderTest;
   friend class ShortcutsBackendTest;
-  FRIEND_TEST_ALL_PREFIXES(ShortcutsBackendTest, EntitySuggestionTest);
 
   enum CurrentState {
     NOT_INITIALIZED,  // Backend created but not initialized.
@@ -94,7 +93,7 @@
   virtual ~ShortcutsBackend();
 
   static history::ShortcutsDatabase::Shortcut::MatchCore MatchToMatchCore(
-      const AutocompleteMatch& match, Profile* profile);
+      const AutocompleteMatch& match);
 
   // RefcountedBrowserContextKeyedService:
   virtual void ShutdownOnUIThread() OVERRIDE;
@@ -128,7 +127,6 @@
   // Deletes all of the shortcuts.
   bool DeleteAllShortcuts();
 
-  Profile* profile_;
   CurrentState current_state_;
   ObserverList<ShortcutsBackendObserver> observer_list_;
   scoped_refptr<history::ShortcutsDatabase> db_;