Restored vm-connect Observatory_UI tests

runtime/observatory/lib/src/elements/vm_connect.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library vm_connect_element;
 
 import 'dart:html';
 import 'dart:async';
 import 'dart:convert';
 import 'package:observatory/models.dart' as M;
-import 'package:observatory/app.dart';
 import 'package:observatory/src/elements/helpers/tag.dart';
 import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 import 'package:observatory/src/elements/helpers/nav_bar.dart';
-import 'package:observatory/src/elements/helpers/uris.dart';
 import 'package:observatory/src/elements/nav/notify.dart';
 import 'package:observatory/src/elements/nav/top_menu.dart';
 import 'package:observatory/src/elements/view_footer.dart';
 import 'package:observatory/src/elements/vm_connect_target.dart';
 
 typedef void CrashDumpLoadCallback(Map dump);
 
 class VMConnectElement extends HtmlElement implements Renderable {
   static const tag =
       const Tag<VMConnectElement>('vm-connect', dependencies: const [
@@ skipping 64 matching lines @@
           new DivElement()
             ..classes = ['flex-row']
             ..children = [
               new DivElement()
                 ..classes = ['flex-item-40-percent']
                 ..children = [
                   new HeadingElement.h2()..text = 'Connect over WebSocket',
                   new BRElement(),
                   new UListElement()
                     ..children = _targets.list().map((target) {
-                      final ObservatoryApplication app =
-                          ObservatoryApplication.app;
-                      final bool current = (app != null)
-                          ? app.isConnectedVMTarget(target)
-                          : false;
+                      final bool current = _targets.isConnectedVMTarget(target);
                       return new LIElement()
                         ..children = [
                           new VMConnectTargetElement(target,
                               current: current, queue: _r.queue)
                             ..onConnect.listen(_connect)
                             ..onDelete.listen(_delete)
                         ];
                     }).toList(),
                   new HRElement(),
                   new FormElement()
@@ skipping 63 matching lines @@
     return e;
   }
 
   void _createAndConnect() {
     if (_address == null || _address.isEmpty) return;
     String normalizedNetworkAddress = _normalizeStandaloneAddress(_address);
     _targets.add(normalizedNetworkAddress);
     var target = _targets.find(normalizedNetworkAddress);
     assert(target != null);
     _targets.setCurrent(target);
-    ObservatoryApplication.app.locationManager.go(Uris.vm());
+    // the navigation to the VM page is done in the ObservatoryApplication
   }
 
   void _connect(TargetEvent e) {
     _targets.setCurrent(e.target);
   }
 
   void _delete(TargetEvent e) => _targets.delete(e.target);
 
   static String _normalizeStandaloneAddress(String networkAddress) {
     if (!networkAddress.startsWith('http') &&
         !networkAddress.startsWith('ws')) {
       networkAddress = 'http://$networkAddress';
     }
     try {
       Uri uri = Uri.parse(networkAddress);
-      return 'ws://${uri.authority}${uri.path}ws';
+      if (uri.path.endsWith('/ws')) {
+        return 'ws://${uri.authority}${uri.path}';
+      }
+      return 'ws://${uri.authority}${uri.path}/ws';
     } catch (e) {
       print('caught exception with: $networkAddress -- $e');
       return networkAddress;
     }
   }
 }