RefCounted types should not have public destructors, chrome/browser/bookmarks/ edition

BUG=123295
TEST=none


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

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

3 files changed, 164 insertions, 73 deletions

diff --git a/chrome/browser/bookmarks/bookmark_extension_api.h b/chrome/browser/bookmarks/bookmark_extension_api.h
index ef2f8d6..256c24f 100644
--- a/chrome/browser/bookmarks/bookmark_extension_api.h
+++ b/chrome/browser/bookmarks/bookmark_extension_api.h
@@ -74,9 +74,9 @@ class BookmarksFunction : public AsyncExtensionFunction,
   // AsyncExtensionFunction:
   virtual void Run() OVERRIDE;
 
-  virtual bool RunImpl() = 0;
-
  protected:
+  virtual ~BookmarksFunction() {}
+
   // Helper to get the bookmark id as int64 from the given string id.
   // Sets error_ to an error string if the given id string can't be parsed
   // as an int64. In case of error, doesn't change id and returns false.
@@ -97,111 +97,152 @@ class BookmarksFunction : public AsyncExtensionFunction,
 
 class GetBookmarksFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.get")
+
+ protected:
+  virtual ~GetBookmarksFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class GetBookmarkChildrenFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.getChildren")
+
+ protected:
+  virtual ~GetBookmarkChildrenFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class GetBookmarkRecentFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.getRecent")
+
+ protected:
+  virtual ~GetBookmarkRecentFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class GetBookmarkTreeFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.getTree")
+
+ protected:
+  virtual ~GetBookmarkTreeFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class GetBookmarkSubTreeFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.getSubTree")
+
+ protected:
+  virtual ~GetBookmarkSubTreeFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class SearchBookmarksFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.search")
+
+ protected:
+  virtual ~SearchBookmarksFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class RemoveBookmarkFunction : public BookmarksFunction {
  public:
+  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.remove")
+
   // Returns true on successful parse and sets invalid_id to true if conversion
   // from id string to int64 failed.
   static bool ExtractIds(const base::ListValue* args, std::list<int64>* ids,
                          bool* invalid_id);
-  // BookmarksFunction:
-  virtual bool RunImpl() OVERRIDE;
+  // ExtensionFunction:
   virtual void GetQuotaLimitHeuristics(
       QuotaLimitHeuristics* heuristics) const OVERRIDE;
 
- private:
-  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.remove")
+ protected:
+  virtual ~RemoveBookmarkFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class RemoveTreeBookmarkFunction : public RemoveBookmarkFunction {
+ public:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.removeTree")
+
+ protected:
+  virtual ~RemoveTreeBookmarkFunction() {}
 };
 
 class CreateBookmarkFunction : public BookmarksFunction {
  public:
+  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.create")
+
+  // ExtensionFunction:
   virtual void GetQuotaLimitHeuristics(
       QuotaLimitHeuristics* heuristics) const OVERRIDE;
-  // BookmarksFunction:
-  virtual bool RunImpl() OVERRIDE;
 
- private:
-  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.create")
+ protected:
+  virtual ~CreateBookmarkFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class MoveBookmarkFunction : public BookmarksFunction {
  public:
+  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.move")
+
   static bool ExtractIds(const base::ListValue* args, std::list<int64>* ids,
                          bool* invalid_id);
+
+  // ExtensionFunction:
   virtual void GetQuotaLimitHeuristics(
       QuotaLimitHeuristics* heuristics) const OVERRIDE;
-  // BookmarksFunction:
-  virtual bool RunImpl() OVERRIDE;
 
- private:
-  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.move")
+ protected:
+  virtual ~MoveBookmarkFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class UpdateBookmarkFunction : public BookmarksFunction {
  public:
+  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.update")
+
   static bool ExtractIds(const base::ListValue* args, std::list<int64>* ids,
                          bool* invalid_id);
+
+  // ExtensionFunction:
   virtual void GetQuotaLimitHeuristics(
       QuotaLimitHeuristics* heuristics) const OVERRIDE;
+
+ protected:
+  virtual ~UpdateBookmarkFunction() {}
+
+  // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
- private:
-  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.update")
 };
 
 class BookmarksIOFunction : public BookmarksFunction,
                             public SelectFileDialog::Listener {
  public:
   BookmarksIOFunction();
-  virtual ~BookmarksIOFunction();
 
   virtual void FileSelected(const FilePath& path, int index, void* params) = 0;
 
@@ -212,6 +253,9 @@ class BookmarksIOFunction : public BookmarksFunction,
 
   void SelectFile(SelectFileDialog::Type type);
 
+ protected:
+  virtual ~BookmarksIOFunction();
+
  private:
   void ShowSelectFileDialog(
       SelectFileDialog::Type type,
@@ -223,24 +267,32 @@ class BookmarksIOFunction : public BookmarksFunction,
 
 class ImportBookmarksFunction : public BookmarksIOFunction {
  public:
+  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.import");
+
   // BookmarkManagerIOFunction:
-  virtual bool RunImpl() OVERRIDE;
   virtual void FileSelected(const FilePath& path, int index, void* params)
       OVERRIDE;
 
  private:
-  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.import");
+  virtual ~ImportBookmarksFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class ExportBookmarksFunction : public BookmarksIOFunction {
  public:
+  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.export");
+
   // BookmarkManagerIOFunction:
-  virtual bool RunImpl() OVERRIDE;
   virtual void FileSelected(const FilePath& path, int index, void* params)
       OVERRIDE;
 
  private:
-  DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.export");
+  virtual ~ExportBookmarksFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_H_
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 2e9376e..7dfe7ef 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -151,6 +151,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
   }
 
  private:
+  friend class base::RefCountedThreadSafe<Writer>;
+
   // Types of text being written out. The type dictates how the text is
   // escaped.
   enum TextType {
@@ -162,6 +164,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
     CONTENT
   };
 
+  ~Writer() {}
+
   // Opens the file, returning true on success.
   bool OpenFile() {
     int flags = base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE;
diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.h b/chrome/browser/bookmarks/bookmark_manager_extension_api.h
index 8827806..99d22c6 100644
--- a/chrome/browser/bookmarks/bookmark_manager_extension_api.h
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -55,95 +55,130 @@ class BookmarkManagerExtensionEventRouter
 
 class ClipboardBookmarkManagerFunction : public BookmarksFunction {
  protected:
+  virtual ~ClipboardBookmarkManagerFunction() {}
+
   bool CopyOrCut(bool cut);
 };
 
 class CopyBookmarkManagerFunction : public ClipboardBookmarkManagerFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.copy");
+
+ protected:
+  virtual ~CopyBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class CutBookmarkManagerFunction : public ClipboardBookmarkManagerFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.cut");
+
+ protected:
+  virtual ~CutBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class PasteBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.paste");
+
+ protected:
+  virtual ~PasteBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class CanPasteBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.canPaste");
+
+ protected:
+  virtual ~CanPasteBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class SortChildrenBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.sortChildren");
+
+ protected:
+  virtual ~SortChildrenBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class BookmarkManagerGetStringsFunction : public AsyncExtensionFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.getStrings");
+
+ protected:
+  virtual ~BookmarkManagerGetStringsFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class StartDragBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.startDrag");
+
+ protected:
+  virtual ~StartDragBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class DropBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.drop");
+
+ protected:
+  virtual ~DropBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class GetSubtreeBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.getSubtree");
+
+ protected:
+  virtual ~GetSubtreeBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class CanEditBookmarkManagerFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.canEdit");
+
+ protected:
+  virtual ~CanEditBookmarkManagerFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 class RecordLaunchBookmarkFunction : public BookmarksFunction {
  public:
-  virtual bool RunImpl() OVERRIDE;
-
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.recordLaunch")
+
+ protected:
+  virtual ~RecordLaunchBookmarkFunction() {}
+
+  // ExtensionFunction:
+  virtual bool RunImpl() OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_