RefCounted types should not have public destructors, net/

BUG=123295
TEST=none


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

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

5 files changed, 108 insertions, 35 deletions

diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index 84fc30d..8f516ce 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -532,9 +532,9 @@ class CookieMonster::CookieMonsterTask
     return cookie_monster_;
   }
 
+ private:
   friend class base::RefCountedThreadSafe<CookieMonsterTask>;
 
- private:
   CookieMonster* cookie_monster_;
   scoped_refptr<base::MessageLoopProxy> thread_;
 
@@ -544,9 +544,10 @@ class CookieMonster::CookieMonsterTask
 CookieMonster::CookieMonsterTask::CookieMonsterTask(
     CookieMonster* cookie_monster)
     : cookie_monster_(cookie_monster),
-      thread_(base::MessageLoopProxy::current()) { }
+      thread_(base::MessageLoopProxy::current()) {
+}
 
-CookieMonster::CookieMonsterTask::~CookieMonsterTask() { }
+CookieMonster::CookieMonsterTask::~CookieMonsterTask() {}
 
 // Unfortunately, one cannot re-bind a Callback with parameters into a closure.
 // Therefore, the closure passed to InvokeCallback is a clumsy binding of
@@ -586,10 +587,15 @@ class CookieMonster::SetCookieWithDetailsTask
         expiration_time_(expiration_time),
         secure_(secure),
         http_only_(http_only),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~SetCookieWithDetailsTask() {}
+
  private:
   GURL url_;
   std::string name_;
@@ -621,10 +627,15 @@ class CookieMonster::GetAllCookiesTask
   GetAllCookiesTask(CookieMonster* cookie_monster,
                     const CookieMonster::GetCookieListCallback& callback)
       : CookieMonsterTask(cookie_monster),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~GetAllCookiesTask() {}
+
  private:
   CookieMonster::GetCookieListCallback callback_;
 
@@ -651,10 +662,15 @@ class CookieMonster::GetAllCookiesForURLWithOptionsTask
       : CookieMonsterTask(cookie_monster),
         url_(url),
         options_(options),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~GetAllCookiesForURLWithOptionsTask() {}
+
  private:
   GURL url_;
   CookieOptions options_;
@@ -678,10 +694,15 @@ class CookieMonster::DeleteAllTask : public CookieMonster::CookieMonsterTask {
   DeleteAllTask(CookieMonster* cookie_monster,
                 const CookieMonster::DeleteCallback& callback)
       : CookieMonsterTask(cookie_monster),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~DeleteAllTask() {}
+
  private:
   CookieMonster::DeleteCallback callback_;
 
@@ -708,10 +729,15 @@ class CookieMonster::DeleteAllCreatedBetweenTask
       : CookieMonsterTask(cookie_monster),
         delete_begin_(delete_begin),
         delete_end_(delete_end),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~DeleteAllCreatedBetweenTask() {}
+
  private:
   Time delete_begin_;
   Time delete_end_;
@@ -738,10 +764,15 @@ class CookieMonster::DeleteAllForHostTask
                        const CookieMonster::DeleteCallback& callback)
       : CookieMonsterTask(cookie_monster),
         url_(url),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~DeleteAllForHostTask() {}
+
  private:
   GURL url_;
   CookieMonster::DeleteCallback callback_;
@@ -767,10 +798,15 @@ class CookieMonster::DeleteCanonicalCookieTask
       const CookieMonster::DeleteCookieCallback& callback)
       : CookieMonsterTask(cookie_monster),
         cookie_(cookie),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~DeleteCanonicalCookieTask() {}
+
  private:
   CookieMonster::CanonicalCookie cookie_;
   CookieMonster::DeleteCookieCallback callback_;
@@ -799,10 +835,15 @@ class CookieMonster::SetCookieWithOptionsTask
         url_(url),
         cookie_line_(cookie_line),
         options_(options),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~SetCookieWithOptionsTask() {}
+
  private:
   GURL url_;
   std::string cookie_line_;
@@ -832,10 +873,15 @@ class CookieMonster::GetCookiesWithOptionsTask
       : CookieMonsterTask(cookie_monster),
         url_(url),
         options_(options),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~GetCookiesWithOptionsTask() {}
+
  private:
   GURL url_;
   CookieOptions options_;
@@ -866,8 +912,12 @@ class CookieMonster::GetCookiesWithInfoTask
         options_(options),
         callback_(callback) { }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~GetCookiesWithInfoTask() {}
+
  private:
   GURL url_;
   CookieOptions options_;
@@ -901,8 +951,12 @@ class CookieMonster::DeleteCookieTask
         cookie_name_(cookie_name),
         callback_(callback) { }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~DeleteCookieTask() {}
+
  private:
   GURL url_;
   std::string cookie_name_;
@@ -926,10 +980,15 @@ class CookieMonster::DeleteSessionCookiesTask
       CookieMonster* cookie_monster,
       const CookieMonster::DeleteCallback& callback)
       : CookieMonsterTask(cookie_monster),
-        callback_(callback) { }
+        callback_(callback) {
+  }
 
+  // CookieMonster::CookieMonsterTask:
   virtual void Run() OVERRIDE;
 
+ protected:
+  virtual ~DeleteSessionCookiesTask() {}
+
  private:
   CookieMonster::DeleteCallback callback_;
 
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index 1eced59..8eef2ba 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -932,8 +932,6 @@ typedef base::RefCountedThreadSafe<CookieMonster::PersistentCookieStore>
 class CookieMonster::PersistentCookieStore
     : public RefcountedPersistentCookieStore {
  public:
-  virtual ~PersistentCookieStore() {}
-
   typedef base::Callback<void(const std::vector<
       CookieMonster::CanonicalCookie*>&)> LoadedCallback;
 
@@ -963,8 +961,10 @@ class CookieMonster::PersistentCookieStore
 
  protected:
   PersistentCookieStore() {}
+  virtual ~PersistentCookieStore() {}
 
  private:
+  friend class base::RefCountedThreadSafe<PersistentCookieStore>;
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc
index 822aacc..f347e8d 100644
--- a/net/cookies/cookie_monster_store_test.cc
+++ b/net/cookies/cookie_monster_store_test.cc
@@ -25,8 +25,6 @@ MockPersistentCookieStore::MockPersistentCookieStore()
       loaded_(false) {
 }
 
-MockPersistentCookieStore::~MockPersistentCookieStore() {}
-
 void MockPersistentCookieStore::SetLoadExpectation(
     bool return_value,
     const std::vector<CookieMonster::CanonicalCookie*>& result) {
@@ -85,6 +83,8 @@ void
 MockPersistentCookieStore::SetClearLocalStateOnExit(bool clear_local_state) {
 }
 
+MockPersistentCookieStore::~MockPersistentCookieStore() {}
+
 MockCookieMonsterDelegate::MockCookieMonsterDelegate() {}
 
 void MockCookieMonsterDelegate::OnCookieChanged(
@@ -97,18 +97,6 @@ void MockCookieMonsterDelegate::OnCookieChanged(
 
 MockCookieMonsterDelegate::~MockCookieMonsterDelegate() {}
 
-void AddCookieToList(
-    const std::string& key,
-    const std::string& cookie_line,
-    const base::Time& creation_time,
-    std::vector<CookieMonster::CanonicalCookie*>* out_list) {
-  scoped_ptr<CookieMonster::CanonicalCookie> cookie(
-      new CookieMonster::CanonicalCookie(
-          BuildCanonicalCookie(key, cookie_line, creation_time)));
-
-  out_list->push_back(cookie.release());
-}
-
 CookieMonster::CanonicalCookie BuildCanonicalCookie(
     const std::string& key,
     const std::string& cookie_line,
@@ -135,10 +123,21 @@ CookieMonster::CanonicalCookie BuildCanonicalCookie(
       !cookie_expires.is_null(), !cookie_expires.is_null());
 }
 
-MockSimplePersistentCookieStore::MockSimplePersistentCookieStore()
-    : loaded_(false) {}
+void AddCookieToList(
+    const std::string& key,
+    const std::string& cookie_line,
+    const base::Time& creation_time,
+    std::vector<CookieMonster::CanonicalCookie*>* out_list) {
+  scoped_ptr<CookieMonster::CanonicalCookie> cookie(
+      new CookieMonster::CanonicalCookie(
+          BuildCanonicalCookie(key, cookie_line, creation_time)));
 
-MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {}
+  out_list->push_back(cookie.release());
+}
+
+MockSimplePersistentCookieStore::MockSimplePersistentCookieStore()
+    : loaded_(false) {
+}
 
 void MockSimplePersistentCookieStore::Load(
     const LoadedCallback& loaded_callback) {
@@ -228,4 +227,6 @@ CookieMonster* CreateMonsterFromStoreForGC(
   return new CookieMonster(store, NULL);
 }
 
+MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {}
+
 }  // namespace net
diff --git a/net/cookies/cookie_monster_store_test.h b/net/cookies/cookie_monster_store_test.h
index a05ddd3..fd4218d 100644
--- a/net/cookies/cookie_monster_store_test.h
+++ b/net/cookies/cookie_monster_store_test.h
@@ -33,13 +33,15 @@ class LoadedCallbackTask
 
   LoadedCallbackTask(LoadedCallback loaded_callback,
                      std::vector<CookieMonster::CanonicalCookie*> cookies);
-  ~LoadedCallbackTask();
 
   void Run() {
     loaded_callback_.Run(cookies_);
   }
 
  private:
+  friend class base::RefCountedThreadSafe<LoadedCallbackTask>;
+  ~LoadedCallbackTask();
+
   LoadedCallback loaded_callback_;
   std::vector<CookieMonster::CanonicalCookie*> cookies_;
 
@@ -72,7 +74,6 @@ class MockPersistentCookieStore
   typedef std::vector<CookieStoreCommand> CommandList;
 
   MockPersistentCookieStore();
-  virtual ~MockPersistentCookieStore();
 
   void SetLoadExpectation(
       bool return_value,
@@ -100,6 +101,9 @@ class MockPersistentCookieStore
   // No files are created so nothing to clear either
   virtual void SetClearLocalStateOnExit(bool clear_local_state) OVERRIDE;
 
+ protected:
+  virtual ~MockPersistentCookieStore();
+
  private:
   CommandList commands_;
 
@@ -157,7 +161,6 @@ class MockSimplePersistentCookieStore
     : public CookieMonster::PersistentCookieStore {
  public:
   MockSimplePersistentCookieStore();
-  virtual ~MockSimplePersistentCookieStore();
 
   virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE;
 
@@ -177,6 +180,9 @@ class MockSimplePersistentCookieStore
 
   virtual void SetClearLocalStateOnExit(bool clear_local_state) OVERRIDE;
 
+ protected:
+  virtual ~MockSimplePersistentCookieStore();
+
  private:
   typedef std::map<int64, CookieMonster::CanonicalCookie>
       CanonicalCookieMap;
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index a6b59d0..d2706a5 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -45,6 +45,9 @@ class NewMockPersistentCookieStore
   MOCK_METHOD1(DeleteCookie, void(const CookieMonster::CanonicalCookie& cc));
   MOCK_METHOD1(SetClearLocalStateOnExit, void(bool clear_local_state));
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
+
+ private:
+  virtual ~NewMockPersistentCookieStore() {}
 };
 
 const char* kTopLevelDomainPlus1 = "http://www.harvard.edu";
@@ -2232,6 +2235,8 @@ class FlushablePersistentStore : public CookieMonster::PersistentCookieStore {
   }
 
  private:
+  virtual ~FlushablePersistentStore() {}
+
   volatile int flush_count_;
 };
 
@@ -2250,6 +2255,8 @@ class CallbackCounter : public base::RefCountedThreadSafe<CallbackCounter> {
 
  private:
   friend class base::RefCountedThreadSafe<CallbackCounter>;
+  ~CallbackCounter() {}
+
   volatile int callback_count_;
 };