Initial implementation of dedupping search provider's URLs.

chrome/browser/autocomplete/autocomplete_controller.cc

 // 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.
 
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 260 matching lines @@
   // the providers again.
   UpdateResult(false);
 }
 
 void AutocompleteController::OnProviderUpdate(bool updated_matches) {
   if (in_zero_suggest_) {
     // We got ZeroSuggest results before Start(). Show only those results,
     // because results from other providers are stale.
     result_.Reset();
     result_.AppendMatches(zero_suggest_provider_->matches());
-    result_.SortAndCull(input_);
+    result_.SortAndCull(input_, profile_);
     NotifyChanged(true);
   } else {
     CheckIfDone();
     // Multiple providers may provide synchronous results, so we only update the
     // results if we're not in Start().
     if (!in_start_ && (updated_matches || done_))
       UpdateResult(false);
   }
 }
 
@@ skipping 12 matching lines @@
 
 void AutocompleteController::UpdateResult(bool is_synchronous_pass) {
   AutocompleteResult last_result;
   last_result.Swap(&result_);
 
   for (ACProviders::const_iterator i(providers_.begin()); i != providers_.end();
        ++i)
     result_.AppendMatches((*i)->matches());
 
   // Sort the matches and trim to a small number of "best" matches.
-  result_.SortAndCull(input_);
+  result_.SortAndCull(input_, profile_);
 
   // Need to validate before invoking CopyOldMatches as the old matches are not
   // valid against the current input.
 #ifndef NDEBUG
   result_.Validate();
 #endif
 
   if (!done_) {
     // This conditional needs to match the conditional in Start that invokes
     // StartExpireTimer.
-    result_.CopyOldMatches(input_, last_result);
+    result_.CopyOldMatches(input_, last_result, profile_);
   }
 
   UpdateKeywordDescriptions(&result_);
   UpdateAssociatedKeywords(&result_);
   UpdateAssistedQueryStats(&result_);
 
   bool notify_default_match = is_synchronous_pass;
   if (!is_synchronous_pass) {
     const bool last_default_was_valid =
         last_result.default_match() != last_result.end();
@@ skipping 66 matching lines @@
     } else {
       count++;
     }
     last_type = type;
   }
   AppendAvailableAutocompletion(last_type, count, &autocompletions);
 
   // Go over all matches and set AQS if the match supports it.
   for (size_t index = 0; index < result->size(); ++index) {
     AutocompleteMatch* match = result->match_at(index);
-    const TemplateURL* template_url = match->GetTemplateURL(profile_);
+    const TemplateURL* template_url = match->GetTemplateURL(profile_, false);
     if (!template_url || !match->search_terms_args.get())
       continue;
     match->search_terms_args->assisted_query_stats =
         base::StringPrintf("chrome.%" PRIuS ".%s",
                            index,
                            autocompletions.c_str());
     match->destination_url = GURL(template_url->url_ref().ReplaceSearchTerms(
         *match->search_terms_args));
   }
 }
 
 void AutocompleteController::UpdateKeywordDescriptions(
     AutocompleteResult* result) {
   string16 last_keyword;
   for (AutocompleteResult::iterator i(result->begin()); i != result->end();
        ++i) {
     if ((i->provider->type() == AutocompleteProvider::TYPE_KEYWORD &&
          !i->keyword.empty()) ||
         (i->provider->type() == AutocompleteProvider::TYPE_SEARCH &&
          AutocompleteMatch::IsSearchType(i->type))) {
       i->description.clear();
       i->description_class.clear();
       DCHECK(!i->keyword.empty());
       if (i->keyword != last_keyword) {
-        const TemplateURL* template_url = i->GetTemplateURL(profile_);
+        const TemplateURL* template_url = i->GetTemplateURL(profile_, false);
         if (template_url) {
           i->description = l10n_util::GetStringFUTF16(
               IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
               template_url->AdjustedShortNameForLocaleDirection());
           i->description_class.push_back(
               ACMatchClassification(0, ACMatchClassification::DIM));
         }
         last_keyword = i->keyword;
       }
     } else {
@@ skipping 23 matching lines @@
   }
   done_ = true;
 }
 
 void AutocompleteController::StartExpireTimer() {
   if (result_.HasCopiedMatches())
     expire_timer_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kExpireTimeMS),
                         this, &AutocompleteController::ExpireCopiedEntries);
 }