Remove Profile from BaseSearchProvider::NavigationResult

chrome/browser/autocomplete/base_search_provider.cc

 // Copyright 2014 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/base_search_provider.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
@@ skipping 47 matching lines @@
     return AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED;
   if (type == "PROFILE")
     return AutocompleteMatchType::SEARCH_SUGGEST_PROFILE;
   if (type == "NAVIGATION")
     return AutocompleteMatchType::NAVSUGGEST;
   if (type == "PERSONALIZED_NAVIGATION")
     return AutocompleteMatchType::NAVSUGGEST_PERSONALIZED;
   return AutocompleteMatchType::SEARCH_SUGGEST;
 }
 
-base::string16 StringForURLDisplayWithAcceptLanguages(Profile* profile,
-                                                      const GURL& url) {
-  std::string languages = profile ?
-      profile->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::string();
-  return net::FormatUrl(url, languages,
-                        net::kFormatUrlOmitAll & ~net::kFormatUrlOmitHTTP,
-                        net::UnescapeRule::SPACES, NULL, NULL, NULL);
-}
-
 } // namespace
 
 // SuggestionDeletionHandler -------------------------------------------------
 
 // This class handles making requests to the server in order to delete
 // personalized suggestions.
 class SuggestionDeletionHandler : public net::URLFetcherDelegate {
  public:
   typedef base::Callback<void(bool, SuggestionDeletionHandler*)>
       DeletionCompletedCallback;
@@ skipping 270 matching lines @@
     const AutocompleteInput& input,
     bool keyword_provider_requested) const {
   if (!from_keyword_provider_ && keyword_provider_requested)
     return 100;
   return ((input.type() == metrics::OmniboxInputType::URL) ? 300 : 600);
 }
 
 // BaseSearchProvider::NavigationResult ----------------------------------------
 
 BaseSearchProvider::NavigationResult::NavigationResult(
-    const AutocompleteProvider& provider,
-    Profile* profile,
+    const AutocompleteSchemeClassifier& scheme_classifier,
     const GURL& url,
     AutocompleteMatchType::Type type,
     const base::string16& description,
     const std::string& deletion_url,
     bool from_keyword_provider,
     int relevance,
     bool relevance_from_server,
     const base::string16& input_text,
     const std::string& languages)
     : Result(from_keyword_provider, relevance, relevance_from_server, type,
              deletion_url),
       url_(url),
       formatted_url_(AutocompleteInput::FormattedStringWithEquivalentMeaning(
-          url, StringForURLDisplayWithAcceptLanguages(profile, url),
-          ChromeAutocompleteSchemeClassifier(profile))),
+          url, net::FormatUrl(url, languages,
+                              net::kFormatUrlOmitAll & ~net::kFormatUrlOmitHTTP,
+                              net::UnescapeRule::SPACES, NULL, NULL, NULL),
+          scheme_classifier)),
       description_(description) {
   DCHECK(url_.is_valid());
   CalculateAndClassifyMatchContents(true, input_text, languages);
 }
 
 BaseSearchProvider::NavigationResult::~NavigationResult() {}
 
 void BaseSearchProvider::NavigationResult::CalculateAndClassifyMatchContents(
     const bool allow_bolding_nothing,
     const base::string16& input_text,
@@ skipping 512 matching lines @@
     if ((match_type == AutocompleteMatchType::NAVSUGGEST) ||
         (match_type == AutocompleteMatchType::NAVSUGGEST_PERSONALIZED)) {
       // Do not blindly trust the URL coming from the server to be valid.
       GURL url(
           url_fixer::FixupURL(base::UTF16ToUTF8(suggestion), std::string()));
       if (url.is_valid() && allow_navsuggest) {
         base::string16 title;
         if (descriptions != NULL)
           descriptions->GetString(index, &title);
         results->navigation_results.push_back(NavigationResult(
-            *this, profile_, url, match_type, title, deletion_url,
-            is_keyword_result, relevance, relevances != NULL, input.text(),
-            languages));
+            ChromeAutocompleteSchemeClassifier(profile_), url, match_type,
+            title, deletion_url, is_keyword_result, relevance,
+            relevances != NULL, input.text(), languages));
       }
     } else {
       base::string16 match_contents = suggestion;
       base::string16 match_contents_prefix;
       base::string16 annotation;
       base::string16 answer_contents;
       base::string16 answer_type;
       std::string suggest_query_params;
 
       if (suggestion_details) {
@@ skipping 92 matching lines @@
 }
 
 void BaseSearchProvider::OnDeletionComplete(
     bool success, SuggestionDeletionHandler* handler) {
   RecordDeletionResult(success);
   SuggestionDeletionHandlers::iterator it = std::find(
       deletion_handlers_.begin(), deletion_handlers_.end(), handler);
   DCHECK(it != deletion_handlers_.end());
   deletion_handlers_.erase(it);
 }