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

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/automation/ui_controls_win.cc b/chrome/browser/automation/ui_controls_win.cc
index 29ca089..43e8b32 100644
--- a/chrome/browser/automation/ui_controls_win.cc
+++ b/chrome/browser/automation/ui_controls_win.cc
@@ -24,8 +24,6 @@ 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);
@@ -35,6 +33,10 @@ 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();