Drop |languages| from {Format,Elide}Url* and IDNToUnicode

components/omnibox/browser/history_url_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 COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_
 #define COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 85 matching lines @@
   // See comments on |promote_type| below.
   enum PromoteType {
     WHAT_YOU_TYPED_MATCH,
     FRONT_HISTORY_MATCH,
     NEITHER,
   };
 
   HistoryURLProviderParams(const AutocompleteInput& input,
                            bool trim_http,
                            const AutocompleteMatch& what_you_typed_match,
-                           const std::string& languages,
                            TemplateURL* default_search_provider,
                            const SearchTermsData& search_terms_data);
   ~HistoryURLProviderParams();
 
   base::MessageLoop* message_loop;
 
   // A copy of the autocomplete input. We need the copy since this object will
   // live beyond the original query while it runs on the history thread.
   AutocompleteInput input;
 
@@ skipping 42 matching lines @@
   //
   // NOTE: The second pass of DoAutocomplete() checks what the first pass set
   // this to.  See comments in DoAutocomplete().
   PromoteType promote_type;
 
   // True if |what_you_typed_match| is eligible for display.  If this is true,
   // PromoteMatchesIfNecessary() may choose to place |what_you_typed_match| on
   // |matches_| even when |promote_type| is not WHAT_YOU_TYPED_MATCH.
   bool have_what_you_typed_match;
 
-  // Languages we should pass to gfx::GetCleanStringFromUrl.
-  std::string languages;
-
   // The default search provider and search terms data necessary to cull results
   // that correspond to searches (on the default engine).  These can only be
   // obtained on the UI thread, so we have to copy them into here to pass them
   // to the history thread.  We use a scoped_ptr<TemplateURL> for the DSP since
   // TemplateURLs can't be copied by value. We use a scoped_ptr<SearchTermsData>
   // so that we can store a snapshot of the SearchTermsData accessible from the
   // history thread.
   scoped_ptr<TemplateURL> default_search_provider;
   scoped_ptr<SearchTermsData> search_terms_data;
 
@@ skipping 136 matching lines @@
                                    size_t source_index,
                                    const std::vector<GURL>& remove) const;
 
   // Converts a specified |match_number| from params.matches into an
   // autocomplete match for display.  If experimental scoring is enabled, the
   // final relevance score might be different from the given |relevance|.
   // NOTE: This function should only be called on the UI thread.
   AutocompleteMatch HistoryMatchToACMatch(
       const HistoryURLProviderParams& params,
       size_t match_number,
-      MatchType match_type,
       int relevance);
 
   AutocompleteProviderListener* listener_;
 
   // Params for the current query.  The provider should not free this directly;
   // instead, it is passed as a parameter through the history backend, and the
   // parameter itself is freed once it's no longer needed.  The only reason we
   // keep this member is so we can set the cancel bit on it.
   HistoryURLProviderParams* params_;
 
   // Whether to query the history URL database to match.  Even if false, we
   // still use the URL database to decide if the URL-what-you-typed was visited
   // before or not.  If false, the only possible result that HistoryURL provider
   // can return is URL-what-you-typed.  This variable is not part of params_
   // because it never changes after the HistoryURLProvider is initialized.
   // It's used to aid the possible transition to get all URLs from history to
   // be scored in the HistoryQuick provider only.
   bool search_url_database_;
 
   // Params controlling experimental behavior of this provider.
   HUPScoringParams scoring_params_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryURLProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_