Remove hybi sub directory for WebSocket layout tests

Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 75 matching lines @@
         self._mappings = [{'port': self._port}]
 
         if not self._pid_file:
             self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
 
         # Webkit tests
         # FIXME: This is the wrong way to detect if we're in Chrome vs. WebKit!
         # The port objects are supposed to abstract this.
         if self._root:
             self._layout_tests = self._filesystem.abspath(self._root)
-            self._web_socket_tests = self._filesystem.abspath(self._filesystem.join(self._root, 'http', 'tests', 'websocket', 'tests', 'hybi'))
+            self._web_socket_tests = self._filesystem.abspath(self._filesystem.join(self._root, 'http', 'tests', 'websocket'))
         else:
             try:
                 self._layout_tests = self._port_obj.layout_tests_dir()
-                self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http', 'tests', 'websocket', 'tests', 'hybi')
+                self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http', 'tests', 'websocket')
             except:
                 self._web_socket_tests = None
 
         if self._use_tls:
             self._log_prefix = _WSS_LOG_PREFIX
         else:
             self._log_prefix = _WS_LOG_PREFIX
 
     def _prepare_config(self):
         time_str = time.strftime('%d%b%Y-%H%M%S')
@@ skipping 55 matching lines @@
 
     def _stop_running_server(self):
         super(PyWebSocket, self)._stop_running_server()
 
         if self._wsin:
             self._wsin.close()
             self._wsin = None
         if self._wsout:
             self._wsout.close()
             self._wsout = None