Rever r31175 r31176 r31187

XP tests are failing, the guess is r31175 and r31176.

TBR=beng
TEST=XP tests go green

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

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

1 files changed, 4 insertions, 9 deletions

diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index 2766eb7..e8a77dd 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -33,6 +33,7 @@ class Profile;
 class ExtensionFunction : public base::RefCounted<ExtensionFunction> {
  public:
   ExtensionFunction() : request_id_(-1), name_(""), has_callback_(false) {}
+  virtual ~ExtensionFunction() {}
 
   // Specifies the name of the function.
   void set_name(const std::string& name) { name_ = name; }
@@ -68,10 +69,6 @@ class ExtensionFunction : public base::RefCounted<ExtensionFunction> {
   virtual void Run() = 0;
 
  protected:
-  friend class base::RefCounted<ExtensionFunction>;
-
-  virtual ~ExtensionFunction() {}
-
   // Gets the extension that called this function. This can return NULL for
   // async functions.
   Extension* GetExtension() {
@@ -94,6 +91,7 @@ class ExtensionFunction : public base::RefCounted<ExtensionFunction> {
   // of this call.
   bool has_callback_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionFunction);
 };
 
@@ -106,6 +104,7 @@ class ExtensionFunction : public base::RefCounted<ExtensionFunction> {
 class AsyncExtensionFunction : public ExtensionFunction {
  public:
   AsyncExtensionFunction() : args_(NULL), bad_message_(false) {}
+  virtual ~AsyncExtensionFunction() {}
 
   virtual void SetArgs(const Value* args);
   virtual const std::string GetResult();
@@ -120,8 +119,6 @@ class AsyncExtensionFunction : public ExtensionFunction {
   virtual bool RunImpl() = 0;
 
  protected:
-  virtual ~AsyncExtensionFunction() {}
-
   void SendResponse(bool success);
 
   // Note: After Run() returns, dispatcher() can be NULL.  Since these getters
@@ -144,6 +141,7 @@ class AsyncExtensionFunction : public ExtensionFunction {
   // returning.  The calling renderer process will be killed.
   bool bad_message_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(AsyncExtensionFunction);
 };
 
@@ -166,9 +164,6 @@ class SyncExtensionFunction : public AsyncExtensionFunction {
     SendResponse(RunImpl());
   }
 
- protected:
-  virtual ~SyncExtensionFunction() {}
-
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncExtensionFunction);
 };