[AiS] Remove answer contents from all matches other than the first.

components/omnibox/search_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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
 #ifndef COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_
 #define COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_
 
+#include <string>
+#include <vector>

[groby-ooo-7-16, 2014/09/24 22:26:38]

Your change doesn't bring in any of these?

[Justin Donnelly, 2014/09/25 01:05:13]

No, I'm just adding them at the urging of the ICWYU lint.

+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/answers_cache.h"
 #include "components/omnibox/base_search_provider.h"
 #include "components/search_engines/template_url.h"
 #include "net/url_request/url_fetcher_delegate.h"
@@ skipping 200 matching lines @@
 
   // Starts a new URLFetcher requesting suggest results from |template_url|;
   // callers own the returned URLFetcher, which is NULL for invalid providers.
   net::URLFetcher* CreateSuggestFetcher(int id,
                                         const TemplateURL* template_url,
                                         const AutocompleteInput& input);
 
   // Converts the parsed results to a set of AutocompleteMatches, |matches_|.
   void ConvertResultsToAutocompleteMatches();
 
+  // Remove answer contents from each match in |matches| other than the first
+  // that appears.
+  void RemoveExtraAnswers(ACMatches* matches);

[groby-ooo-7-16, 2014/09/24 22:26:38]

Personally, I'd make it static, since it doesn't depend on any state in
SearchProvider. 

If you'd rather not, please make it const.

[Justin Donnelly, 2014/09/25 01:05:13]

Done.

+
   // Returns an iterator to the first match in |matches_| which might
   // be chosen as default.
   ACMatches::const_iterator FindTopMatch() const;
 
   // Checks if suggested relevances violate an expected constraint.
   // See UpdateMatches() for the use and explanation of this constraint
   // and other constraints enforced without the use of helper functions.
   bool IsTopMatchSearchWithURLInput() const;
 
   // Converts an appropriate number of navigation results in
@@ skipping 123 matching lines @@
   base::TimeTicks token_expiration_time_;
 
   // Answers prefetch management.
   AnswersCache answers_cache_;  // Cache for last answers seen.
   AnswersQueryData prefetch_data_;  // Data to use for query prefetching.
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_