Remove protected virtual methods from BaseSearchProvider

chrome/browser/autocomplete/base_search_provider.h

 // 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.
 //
 // This class contains common functionality for search-based autocomplete
 // providers. Search provider and zero suggest provider both use it for common
 // functionality.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
+#include "base/metrics/user_metrics_action.h"
 #include "base/strings/string16.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_provider.h"
 #include "components/omnibox/search_suggestion_parser.h"
 
 class GURL;
 class Profile;
 class SearchTermsData;
@@ skipping 16 matching lines @@
   static const int kDefaultProviderURLFetcherID;
 
   // ID used in creating URLFetcher for keyword provider's suggest results.
   static const int kKeywordProviderURLFetcherID;
 
   // ID used in creating URLFetcher for deleting suggestion results.
   static const int kDeletionURLFetcherID;
 
   BaseSearchProvider(TemplateURLService* template_url_service,
                      Profile* profile,
+                     const base::UserMetricsAction& uma_deletion_success,
+                     const base::UserMetricsAction& uma_deletion_failure,

[Peter Kasting, 2014/08/12 18:31:18]

Unfortunately you can't pass in UMAs like this.  RecordAction() has to take the
name of the action directly as a string literal, because there are tools that
scan our codebase looking for these calls and recording the strings passed to
them.

This is also why our current uses of these aren't using ?:.

[hashimoto, 2014/08/13 05:21:22]

Ugh, you're right.
I should have carefully read the comments in
base/metrics/user_metrics_action.h...

Revived RecordDeletionResult().

                      AutocompleteProvider::Type type);
 
   // Returns whether |match| is flagged as a query that should be prefetched.
   static bool ShouldPrefetch(const AutocompleteMatch& match);
 
   // Returns a simpler AutocompleteMatch suitable for persistence like in
   // ShortcutsDatabase.
   // NOTE: Use with care. Most likely you want the other CreateSearchSuggestion
   // with protected access.
   static AutocompleteMatch CreateSearchSuggestion(
       const base::string16& suggestion,
       AutocompleteMatchType::Type type,
       bool from_keyword_provider,
       const TemplateURL* template_url,
       const SearchTermsData& search_terms_data);
 
   // AutocompleteProvider:
-  virtual void Stop(bool clear_cached_results) OVERRIDE;
   virtual void DeleteMatch(const AutocompleteMatch& match) OVERRIDE;
   virtual void AddProviderInfo(ProvidersInfo* provider_info) const OVERRIDE;
 
   bool field_trial_triggered_in_session() const {
     return field_trial_triggered_in_session_;
   }
 
  protected:
   // The following keys are used to record additional information on matches.
 
@@ skipping 92 matching lines @@
   void SetDeletionURL(const std::string& deletion_url,
                       AutocompleteMatch* match);
 
   // Creates an AutocompleteMatch from |result| to search for the query in
   // |result|. Adds the created match to |map|; if such a match
   // already exists, whichever one has lower relevance is eliminated.
   // |metadata| and |accepted_suggestion| are used for generating an
   // AutocompleteMatch.
   // |mark_as_deletable| indicates whether the match should be marked deletable.
   // NOTE: Any result containing a deletion URL is always marked deletable.
-  void AddMatchToMap(const SearchSuggestionParser::SuggestResult& result,
+  void AddMatchToMap(const AutocompleteInput& input,
+                     const SearchSuggestionParser::SuggestResult& result,
+                     const TemplateURL* template_url,
                      const std::string& metadata,
                      int accepted_suggestion,
+                     bool should_append_extra_params,
                      bool mark_as_deletable,
                      MatchMap* map);
 
   // Parses results from the suggest server and updates the appropriate suggest
   // and navigation result lists in |results|. |default_result_relevance| is
   // the relevance to use if it was not explicitly set by the server.
   // |is_keyword_result| indicates whether the response was received from the
   // keyword provider.
   // Returns whether the appropriate result list members were updated.
   bool ParseSuggestResults(const base::Value& root_val,
+                           const AutocompleteInput& input,
                            int default_result_relevance,
                            bool is_keyword_result,
                            SearchSuggestionParser::Results* results);
 
-  // Returns the TemplateURL corresponding to the keyword or default
-  // provider based on the value of |is_keyword|.
-  virtual const TemplateURL* GetTemplateURL(bool is_keyword) const = 0;
-
-  // Returns the AutocompleteInput for keyword provider or default provider
-  // based on the value of |is_keyword|.
-  virtual const AutocompleteInput GetInput(bool is_keyword) const = 0;
-
-  // Returns whether the destination URL corresponding to the given |result|
-  // should contain command-line-specified query params.
-  virtual bool ShouldAppendExtraParams(
-      const SearchSuggestionParser::SuggestResult& result) const = 0;
-
-  // Stops the suggest query.
-  // NOTE: This does not update |done_|.  Callers must do so.
-  virtual void StopSuggest() = 0;
-
-  // Clears the current results.
-  virtual void ClearAllResults() = 0;
-
-  // Records in UMA whether the deletion request resulted in success.
-  virtual void RecordDeletionResult(bool success) = 0;
-
-  // Modify provider-specific UMA statistics.
-  virtual void ModifyProviderInfo(
-      metrics::OmniboxEventProto_ProviderInfo* provider_info) const;
-
   TemplateURLService* template_url_service_;
   Profile* profile_;
 
   // Whether a field trial, if any, has triggered in the most recent
   // autocomplete query. This field is set to true only if the suggestion
   // provider has completed and the response contained
   // '"google:fieldtrialtriggered":true'.
   bool field_trial_triggered_;
 
   // Same as above except that it is maintained across the current Omnibox
   // session.
   bool field_trial_triggered_in_session_;
 
  private:
   friend class SearchProviderTest;
   FRIEND_TEST_ALL_PREFIXES(SearchProviderTest, TestDeleteMatch);
 
   // Removes the deleted |match| from the list of |matches_|.
   void DeleteMatchFromMatches(const AutocompleteMatch& match);
 
   // This gets called when we have requested a suggestion deletion from the
   // server to handle the results of the deletion. It will be called after the
   // deletion request completes.
   void OnDeletionComplete(bool success,
                           SuggestionDeletionHandler* handler);
 
+  base::UserMetricsAction uma_deletion_success_;
+  base::UserMetricsAction uma_deletion_failure_;
+
   // Each deletion handler in this vector corresponds to an outstanding request
   // that a server delete a personalized suggestion. Making this a ScopedVector
   // causes us to auto-cancel all such requests on shutdown.
   SuggestionDeletionHandlers deletion_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseSearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_