Revert of Handle Search suggest subtypes for Shortcuts DB

chrome/browser/autocomplete/shortcuts_backend.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_BACKEND_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_BACKEND_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 62 matching lines @@
 
   // Looks for an existing shortcut to match.destination_url that starts with
   // |text|.  Updates that shortcut if found, otherwise adds a new shortcut.
   void AddOrUpdateShortcut(const base::string16& text,
                            const AutocompleteMatch& match);
 
  private:
   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.
     INITIALIZING,     // Init() called, but not completed yet.
     INITIALIZED,      // Initialization completed, all accessors can be safely
                       // called.
   };
 
   typedef std::map<std::string, ShortcutMap::iterator> GuidMap;
 
   virtual ~ShortcutsBackend();
 
   static history::ShortcutsDatabase::Shortcut::MatchCore MatchToMatchCore(
-      const AutocompleteMatch& match, Profile* profile);
+      const AutocompleteMatch& match);
 
   // RefcountedBrowserContextKeyedService:
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Internal initialization of the back-end. Posted by Init() to the DB thread.
@@ skipping 13 matching lines @@
   bool DeleteShortcutsWithIDs(
       const history::ShortcutsDatabase::ShortcutIDs& shortcut_ids);
 
   // Deletes all shortcuts whose URLs begin with |url|.  If |exact_match| is
   // true, only shortcuts from exactly |url| are deleted.
   bool DeleteShortcutsWithURL(const GURL& url, bool exact_match);
 
   // Deletes all of the shortcuts.
   bool DeleteAllShortcuts();
 
-  Profile* profile_;
   CurrentState current_state_;
   ObserverList<ShortcutsBackendObserver> observer_list_;
   scoped_refptr<history::ShortcutsDatabase> db_;
 
   // The |temp_shortcuts_map_| and |temp_guid_map_| used for temporary storage
   // between InitInternal() and InitComplete() to avoid doing a potentially huge
   // copy.
   scoped_ptr<ShortcutMap> temp_shortcuts_map_;
   scoped_ptr<GuidMap> temp_guid_map_;
 
   ShortcutMap shortcuts_map_;
   // This is a helper map for quick access to a shortcut by guid.
   GuidMap guid_map_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // For some unit-test only.
   bool no_db_access_;
 
   DISALLOW_COPY_AND_ASSIGN(ShortcutsBackend);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_BACKEND_H_