Remove protected virtual methods from BaseSearchProvider

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright 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/search_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
+#include "base/metrics/user_metrics.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
@@ skipping 37 matching lines @@
 
 // Returns the first match in |matches| with |allowed_to_be_default_match|
 // set to true.
 ACMatches::const_iterator FindDefaultMatch(const ACMatches& matches) {
   ACMatches::const_iterator it = matches.begin();
   while ((it != matches.end()) && !it->allowed_to_be_default_match)
     ++it;
   return it;
 }
 
-class SuggestionDeletionHandler;
-class SearchProviderForTest : public SearchProvider {
- public:
-  SearchProviderForTest(AutocompleteProviderListener* listener,
-                        TemplateURLService* template_url_service,
-                        Profile* profile);
-  bool is_success() { return is_success_; };
-
- protected:
-  virtual ~SearchProviderForTest();
-
- private:
-  virtual void RecordDeletionResult(bool success) OVERRIDE;
-  bool is_success_;
-  DISALLOW_COPY_AND_ASSIGN(SearchProviderForTest);
-};
-
-SearchProviderForTest::SearchProviderForTest(
-    AutocompleteProviderListener* listener,
-    TemplateURLService* template_url_service,
-    Profile* profile)
-    : SearchProvider(listener, template_url_service, profile),
-      is_success_(false) {
-}
-
-SearchProviderForTest::~SearchProviderForTest() {
-}
-
-void SearchProviderForTest::RecordDeletionResult(bool success) {
-  is_success_ = success;
-}
+void CopyString(std::string* out, const std::string& in) { *out = in; }
 
 } // namespace
 
 // SearchProviderTest ---------------------------------------------------------
 
 // The following environment is configured for these tests:
 // . The TemplateURL default_t_url_ is set as the default provider.
 // . The TemplateURL keyword_t_url_ is added to the TemplateURLService. This
 //   TemplateURL has a valid suggest and search URL.
 // . The URL created by using the search term term1_ with default_t_url_ is
@@ skipping 115 matching lines @@
 
   content::TestBrowserThreadBundle thread_bundle_;
 
   // URLFetcherFactory implementation registered.
   net::TestURLFetcherFactory test_factory_;
 
   // Profile we use.
   TestingProfile profile_;
 
   // The provider.
-  scoped_refptr<SearchProviderForTest> provider_;
+  scoped_refptr<SearchProvider> provider_;
+
+  // The last action recorded with base::RecordAction().
+  std::string last_user_metrics_action_;
 
   // If non-NULL, OnProviderUpdate quits the current |run_loop_|.
   base::RunLoop* run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProviderTest);
 };
 
 // static
 const std::string SearchProviderTest::kNotApplicable = "Not Applicable";
 
@@ skipping 37 matching lines @@
   ASSERT_NE(0, keyword_t_url_->id());
 
   // Add a page and search term for keyword_t_url_.
   keyword_url_ = AddSearchToHistory(keyword_t_url_, keyword_term_, 1);
 
   // Keywords are updated by the InMemoryHistoryBackend only after the message
   // has been processed on the history thread. Block until history processes all
   // requests to ensure the InMemoryDatabase is the state we expect it.
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
-  provider_ = new SearchProviderForTest(this, turl_model, &profile_);
+  provider_ = new SearchProvider(this, turl_model, &profile_);
   provider_->kMinimumTimeBetweenSuggestQueriesMs = 0;
+
+  base::AddActionCallback(base::Bind(&CopyString, &last_user_metrics_action_));
 }
 
 void SearchProviderTest::TearDown() {
   base::RunLoop().RunUntilIdle();
 
   // Shutdown the provider before the profile.
   provider_ = NULL;
 }
 
 void SearchProviderTest::RunTest(TestData* cases,
@@ skipping 2767 matching lines @@
   provider_->DeleteMatch(match);
   EXPECT_FALSE(provider_->deletion_handlers_.empty());
   EXPECT_TRUE(provider_->matches_.empty());
   // Set up a default fetcher with provided results.
   net::TestURLFetcher* fetcher = test_factory_.GetFetcherByID(
       SearchProvider::kDeletionURLFetcherID);
   ASSERT_TRUE(fetcher);
   fetcher->set_response_code(200);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   EXPECT_TRUE(provider_->deletion_handlers_.empty());
-  EXPECT_TRUE(provider_->is_success());
+  EXPECT_EQ("Omnibox.ServerSuggestDelete.Success", last_user_metrics_action_);
 
   // Test a failing deletion request.
   provider_->matches_.push_back(match);
   provider_->DeleteMatch(match);
   EXPECT_FALSE(provider_->deletion_handlers_.empty());
   // Set up a default fetcher with provided results.
   fetcher = test_factory_.GetFetcherByID(
       SearchProvider::kDeletionURLFetcherID);
   ASSERT_TRUE(fetcher);
   fetcher->set_response_code(500);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   EXPECT_TRUE(provider_->deletion_handlers_.empty());
-  EXPECT_FALSE(provider_->is_success());
+  EXPECT_EQ("Omnibox.ServerSuggestDelete.Failure", last_user_metrics_action_);
 }
 
 TEST_F(SearchProviderTest, TestDeleteHistoryQueryMatch) {
   GURL term_url(
       AddSearchToHistory(default_t_url_, ASCIIToUTF16("flash games"), 1));
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   AutocompleteMatch games;
   QueryForInput(ASCIIToUTF16("fla"), false, false);
   profile_.BlockUntilHistoryProcessesPendingRequests();
@@ skipping 163 matching lines @@
   // Mismatching input will return empty prefetch data.
   AutocompleteInput input2(base::ASCIIToUTF16("weather n"),
                            base::string16::npos, base::string16(), GURL(),
                            metrics::OmniboxEventProto::INVALID_SPEC, false,
                            false, true, true,
                            ChromeAutocompleteSchemeClassifier(&profile_));
   provider_->DoAnswersQuery(input2);
   EXPECT_TRUE(provider_->prefetch_data_.full_query_text.empty());
   EXPECT_TRUE(provider_->prefetch_data_.query_type.empty());
 }