Merge 208347 "Revert 208315 "Make use of InvalidationService""

sync/tools/testserver/xmppserver.py

 # Copyright 2013 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.
 
 """A bare-bones and non-compliant XMPP server.
 
 Just enough of the protocol is implemented to get it to work with
 Chrome's sync notification system.
 """
 
@@ skipping 557 matching lines @@
       channel: The channel on which to send the notification.
       data: The notification payload.
     """
     notification_stanza = self.MakeNotification(channel, data)
     self.ForwardNotification(None, notification_stanza)
     notification_stanza.unlink()
 
   def SetAuthenticated(self, auth_valid):
     self._authenticated = auth_valid
 
-    # We check authentication only when establishing new connections.  We close
-    # all existing connections here to make sure previously connected clients
-    # pick up on the change.  It's a hack, but it works well enough for our
-    # purposes.
-    if not self._authenticated:
-      for connection in self._handshake_done_connections:
-        connection.close()
-
   def GetAuthenticated(self):
     return self._authenticated
 
   # XmppConnection delegate methods.
   def OnXmppHandshakeDone(self, xmpp_connection):
     self._handshake_done_connections.add(xmpp_connection)
 
   def OnXmppConnectionClosed(self, xmpp_connection):
     self._connections.discard(xmpp_connection)
     self._handshake_done_connections.discard(xmpp_connection)
 
   def ForwardNotification(self, unused_xmpp_connection, notification_stanza):
     if self._notifications_enabled:
       for connection in self._handshake_done_connections:
         print 'Sending notification to %s' % connection
         connection.ForwardNotification(notification_stanza)
     else:
       print 'Notifications disabled; dropping notification'