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, 6 insertions, 4 deletions

diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
index af2a519..046d7f9 100644
--- a/chrome/browser/process_singleton_linux.cc
+++ b/chrome/browser/process_singleton_linux.cc
@@ -402,10 +402,6 @@ class ProcessSingleton::LinuxWatcher
         parent_(parent) {
   }
 
-  virtual ~LinuxWatcher() {
-    STLDeleteElements(&readers_);
-  }
-
   // Start listening for connections on the socket.  This method should be
   // called from the IO thread.
   void StartListening(int socket);
@@ -430,6 +426,12 @@ class ProcessSingleton::LinuxWatcher
   }
 
  private:
+  friend class base::RefCountedThreadSafe<ProcessSingleton::LinuxWatcher>;
+
+  virtual ~LinuxWatcher() {
+    STLDeleteElements(&readers_);
+  }
+
   // Removes and deletes the SocketReader.
   void RemoveSocketReader(SocketReader* reader);