[sync] Divorce python sync test server chromiumsync.py from testserver.py

chrome/test/pyautolib/pyauto.py

Index: chrome/test/pyautolib/pyauto.py
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index b5a2cd4b07eacb3dfdbd572c304a37c235efae22..ec29fd4d58b008d7289e8cfa5a2daf13de93e5d1 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -760,26 +760,6 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
       os.kill(pid, signal.SIGTERM)
 
   @staticmethod
-  def ChromeFlagsForSyncTestServer(port, xmpp_port):
-    """Creates the flags list for the browser to connect to the sync server.
-
-    Use the |ExtraBrowser| class to launch a new browser with these flags.
-
-    Args:
-      port: The HTTP port number.
-      xmpp_port: The XMPP port number.
-
-    Returns:
-      A list with the flags.
-    """
-    return [
-      '--sync-url=http://127.0.0.1:%s/chromiumsync' % port,
-      '--sync-allow-insecure-xmpp-connection',
-      '--sync-notification-host-port=127.0.0.1:%s' % xmpp_port,
-      '--sync-notification-method=p2p',
-    ]
-
-  @staticmethod
   def GetPrivateInfo():
     """Fetch info from private_tests_info.txt in private dir.
 
@@ -862,29 +842,6 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
       time.sleep(retry_sleep)
     return retval if return_retval else False
 
-  def StartSyncServer(self):
-    """Start a local sync server.
-
-    Adds a dictionary attribute 'ports' in returned object.
-
-    Returns:
-      A handle to Sync Server, an instance of TestServer
-    """
-    sync_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_SYNC,
-                                       '127.0.0.1',
-                                       pyautolib.FilePath(''))
-    assert sync_server.Start(), 'Could not start sync server'
-    sync_server.ports = dict(port=sync_server.GetPort(),
-                             xmpp_port=sync_server.GetSyncXmppPort())
-    logging.debug('Started sync server at ports %s.', sync_server.ports)
-    return sync_server
-
-  def StopSyncServer(self, sync_server):
-    """Stop the local sync server."""
-    assert sync_server, 'Sync Server not yet started'
-    assert sync_server.Stop(), 'Could not stop sync server'
-    logging.debug('Stopped sync server at ports %s.', sync_server.ports)
-
   def StartFTPServer(self, data_dir):
     """Start a local file server hosting data files over ftp://