Revert 242029 "Omnibox: Bug Fixes for Shortcuts Inlining"

trunk/src/chrome/browser/autocomplete/shortcuts_provider.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_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
-#include "chrome/browser/autocomplete/url_prefix.h"
 #include "chrome/browser/history/shortcuts_backend.h"
 
 class Profile;
 
 namespace history {
 class ShortcutsProviderTest;
 }
 
 // Provider of recently autocompleted links. Provides autocomplete suggestions
 // from previously selected suggestions. The more often a user selects a
@@ skipping 19 matching lines @@
   typedef std::multimap<char16, base::string16> WordMap;
 
   virtual ~ShortcutsProvider();
 
   // ShortcutsBackendObserver:
   virtual void OnShortcutsLoaded() OVERRIDE;
 
   // Performs the autocomplete matching and scoring.
   void GetMatches(const AutocompleteInput& input);
 
-  // Returns an AutocompleteMatch corresponding to |shortcut|. Assigns it
-  // |relevance| score in the process, and highlights the description and
-  // contents against |term_string|, which should be the lower-cased version
-  // of the user's input.  |term_string| and |fixed_up_term_string| are used
-  // to decide what can be inlined. If |prevent_inline_autocomplete|, no
+  // Returns an AutocompleteMatch corresponding to |shortcut|.  Assigns it
+  // |relevance| score in the process, and highlights the description
+  // and contents against |term_string|, which should be the lower-cased
+  // version of the user's input.  If |prevent_inline_autocomplete|, no
   // matches with inline completions will be allowed to be the default match.
   AutocompleteMatch ShortcutToACMatch(
       const history::ShortcutsBackend::Shortcut& shortcut,
       int relevance,
       const base::string16& term_string,
-      const base::string16& fixed_up_term_string,
-      const bool prevent_inline_autocomplete);
+      bool prevent_inline_autocomplete);
 
   // Returns a map mapping characters to groups of words from |text| that start
   // with those characters, ordered lexicographically descending so that longer
   // words appear before their prefixes (if any) within a particular
   // equal_range().
   static WordMap CreateWordMapForString(const base::string16& text);
 
   // Given |text| and a corresponding base set of classifications
   // |original_class|, adds ACMatchClassification::MATCH markers for all
   // instances of the words from |find_words| within |text| and returns the
@@ skipping 24 matching lines @@
   // Returns shortcuts_map_.end() if there are no matches.
   history::ShortcutsBackend::ShortcutMap::const_iterator FindFirstMatch(
       const base::string16& keyword,
       history::ShortcutsBackend* backend);
 
   int CalculateScore(
       const base::string16& terms,
       const history::ShortcutsBackend::Shortcut& shortcut,
       int max_relevance);
 
-  // Like URLPrefix::BestURLPrefix() except also handles the prefix of
-  // "www.".  This is needed because sometimes the string we're matching
-  // against here (which comes from |fill_into_edit|) can start with
-  // "www." without having a protocol at the beginning.  Because "www."
-  // is not on the default prefix list, we test for it explicitly here
-  // and use that match if the default list didn't have a match or the
-  // default list's match was shorter than it could've been.
-  const URLPrefix* BestURLPrefixWithWWWCase(
-      const base::string16& text,
-      const base::string16& prefix_suffix) const;
-
   std::string languages_;
   bool initialized_;
-  URLPrefix www_prefix_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_