Revert "Revert r31175 r31176 r31187"

The bustage seems to be a WebKit change upstream. It is not reverted in
WebKit and merger. So bring the innocent change back in.

TBR=jam
TEST=green tree

Review URL: http://codereview.chromium.org/375009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31214 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 14 insertions, 2 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.h b/chrome/browser/autocomplete/autocomplete.h
index 0416328..0193b8c 100644
--- a/chrome/browser/autocomplete/autocomplete.h
+++ b/chrome/browser/autocomplete/autocomplete.h
@@ -483,8 +483,6 @@ class AutocompleteProvider
         name_(name) {
   }
 
-  virtual ~AutocompleteProvider();
-
   // Invoked when the profile changes.
   // NOTE: Do not access any previous Profile* at this point as it may have
   // already been deleted.
@@ -538,6 +536,10 @@ class AutocompleteProvider
   static size_t max_matches() { return max_matches_; }
 
  protected:
+  friend class base::RefCountedThreadSafe<AutocompleteProvider>;
+
+  virtual ~AutocompleteProvider();
+
   // Trims "http:" and up to two subsequent slashes from |url|.  Returns the
   // number of characters that were trimmed.
   static size_t TrimHttpPrefix(std::wstring* url);
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
index adff59c..0e8671a 100644
--- a/chrome/browser/autocomplete/autocomplete_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -35,6 +35,8 @@ class TestProvider : public AutocompleteProvider {
   }
 
  private:
+  ~TestProvider() {}
+
   void Run();
 
   void AddResults(int start_at, int num);
diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h
index 49ca83e..18a4b36 100644
--- a/chrome/browser/autocomplete/history_contents_provider.h
+++ b/chrome/browser/autocomplete/history_contents_provider.h
@@ -49,6 +49,8 @@ class HistoryContentsProvider : public AutocompleteProvider {
   static const size_t kMaxMatchCount = 50;
 
  private:
+  ~HistoryContentsProvider() {}
+
   void QueryComplete(HistoryService::Handle handle,
                      history::QueryResults* results);
 
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index b87a2e3..50f6ba7 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.h
@@ -177,6 +177,8 @@ class HistoryURLProvider : public AutocompleteProvider {
   void QueryComplete(HistoryURLProviderParams* params_gets_deleted);
 
  private:
+  ~HistoryURLProvider() {}
+
   struct Prefix {
     Prefix(std::wstring prefix, int num_components)
         : prefix(prefix),
diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index 6caa2b1..adf81d8 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -69,6 +69,8 @@ class KeywordProvider : public AutocompleteProvider {
                      bool minimal_changes);
 
  private:
+  ~KeywordProvider() {}
+
   // Extracts the keyword from |input| into |keyword|. Any remaining characters
   // after the keyword are placed in |remaining_input|. Returns true if |input|
   // is valid and has a keyword. This makes use of SplitKeywordFromInput to
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index f333c4f..f36c070 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -75,6 +75,8 @@ class SearchProvider : public AutocompleteProvider,
   static const int kKeywordProviderURLFetcherID;
 
  private:
+  ~SearchProvider() {}
+
   // Manages the providers (TemplateURLs) used by SearchProvider. Two providers
   // may be used:
   // . The default provider. This corresponds to the user's default search