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

3 files changed, 4 insertions, 12 deletions

diff --git a/chrome/browser/automation/automation_extension_function.h b/chrome/browser/automation/automation_extension_function.h
index ed57ca1..d6fac7d 100644
--- a/chrome/browser/automation/automation_extension_function.h
+++ b/chrome/browser/automation/automation_extension_function.h
@@ -46,8 +46,6 @@ class AutomationExtensionFunction : public ExtensionFunction {
                                                const std::string& target);
 
  private:
-  ~AutomationExtensionFunction() {}
-
   static bool enabled_;
   std::string args_;
   DISALLOW_COPY_AND_ASSIGN(AutomationExtensionFunction);
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 418c804..dc540da 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -56,6 +56,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
                            public IPC::Message::Sender {
  public:
   explicit AutomationProvider(Profile* profile);
+  virtual ~AutomationProvider();
 
   Profile* profile() const { return profile_; }
 
@@ -130,10 +131,6 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   // Adds the external tab passed in to the tab tracker.
   bool AddExternalTab(ExternalTabContainer* external_tab);
 
- protected:
-  friend class base::RefCounted<AutomationProvider>;
-  virtual ~AutomationProvider();
-
  private:
   // IPC Message callbacks.
   void CloseBrowser(int handle, IPC::Message* reply_message);
@@ -570,6 +567,7 @@ class TestingAutomationProvider : public AutomationProvider,
                                   public NotificationObserver {
  public:
   explicit TestingAutomationProvider(Profile* profile);
+  virtual ~TestingAutomationProvider();
 
   // BrowserList::Observer implementation
   // Called immediately after a browser is added to the list
@@ -582,8 +580,6 @@ class TestingAutomationProvider : public AutomationProvider,
   virtual void OnChannelError();
 
  private:
-  virtual ~TestingAutomationProvider();
-
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
diff --git a/chrome/browser/automation/ui_controls_win.cc b/chrome/browser/automation/ui_controls_win.cc
index 43e8b32..29ca089 100644
--- a/chrome/browser/automation/ui_controls_win.cc
+++ b/chrome/browser/automation/ui_controls_win.cc
@@ -24,6 +24,8 @@ class InputDispatcher : public base::RefCounted<InputDispatcher> {
  public:
   InputDispatcher(Task* task, WPARAM message_waiting_for);
 
+  ~InputDispatcher();
+
   // Invoked from the hook. If mouse_message matches message_waiting_for_
   // MatchingMessageFound is invoked.
   void DispatchedMessage(WPARAM mouse_message);
@@ -33,10 +35,6 @@ class InputDispatcher : public base::RefCounted<InputDispatcher> {
   void MatchingMessageFound();
 
  private:
-  friend class base::RefCounted<InputDispatcher>;
-
-  ~InputDispatcher();
-
    // Notifies the task and release this (which should delete it).
   void NotifyTask();