Move the starting of the websocket server next to the starting of the  http server. This should have moved in the previous patch adding retry of unexpected failures. As it is here, if a websocket test needs retrying, the an exception will be thrown because the websocket server is already running from the original test run. Review URL: http://codereview.chromium.org/435035
Move the starting of the websocket server next to the starting of the 
http server. This should have moved in the previous patch
adding retry of unexpected failures. As it is here, if a websocket
test needs retrying, the an exception will be thrown because the
websocket server is already running from the original test run.
Review URL: http://codereview.chromium.org/435035

git-svn-id: http://src.chromium.org/svn/trunk/src@33025 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: d506b3053244e7ff3ffcf657b15f351cca21f8e4
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser