Restored vm-connect Observatory_UI tests

runtime/observatory/lib/src/app/application.dart

 // Copyright (c) 2013, 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.
 
 part of app;
 
 /// The observatory application. Instances of this are created and owned
 /// by the observatory_application custom element.
 class ObservatoryApplication {
   static ObservatoryApplication app;
   final RenderingQueue queue = new RenderingQueue();
-  final TargetRepository targets = new TargetRepository();
+  final TargetRepository targets = new TargetRepository(isConnectedVMTarget);
   final EventRepository events = new EventRepository();
   final NotificationRepository notifications = new NotificationRepository();
   final _pageRegistry = new List<Page>();
   LocationManager _locationManager;
   LocationManager get locationManager => _locationManager;
   Page currentPage;
   bool _vmConnected = false;
   VM _vm;
   VM get vm => _vm;
 
-  bool isConnectedVMTarget(WebSocketVMTarget target) {
-    if (_vm is CommonWebSocketVM) {
-      if ((_vm as CommonWebSocketVM).target == target) {
-        return _vm.isConnected;
+  static bool isConnectedVMTarget(WebSocketVMTarget target) {
+    if (app._vm is CommonWebSocketVM) {
+      if ((app._vm as CommonWebSocketVM).target == target) {
+        return app._vm.isConnected;
       }
     }
     return false;
   }
 
   _switchVM(VM newVM) {
     final VM oldVM = _vm;
 
     Logger.root.info('_switchVM from:${oldVM} to:${newVM}');
 
@@ skipping 191 matching lines @@
 
   ObservatoryApplication(this.rootElement) {
     _locationManager = new LocationManager(this);
     targets.onChange.listen((TargetChangeEvent e) {
       if (e.disconnected) {
         // We don't care about disconnected events.
         return;
       }
       if (targets.current == null) {
         _switchVM(null);
-      }
-      final bool currentTarget =
-          (_vm as WebSocketVM)?.target == targets.current;
-      final bool currentTargetConnected = (_vm != null) && !_vm.isDisconnected;
-      if (!currentTarget || !currentTargetConnected) {
-        _switchVM(new WebSocketVM(targets.current));
-        app.locationManager.go(Uris.vm());
+      } else {
+        final bool currentTarget =
+            (_vm as WebSocketVM)?.target == targets.current;
+        final bool currentTargetConnected = (_vm != null) && _vm.isConnected;
+        if (!currentTarget || !currentTargetConnected) {
+          _switchVM(new WebSocketVM(targets.current));
+          _vm.onConnect.then((_) {
+            app.locationManager.go(Uris.vm());
+          });
+        } else if (currentTargetConnected) {
+          app.locationManager.go(Uris.vm());
+        }
       }
     });
 
     Logger.root.info('Setting initial target to ${targets.current.name}');
     _switchVM(new WebSocketVM(targets.current));
     _initOnce();
 
     // delete pause events.
     events.onIsolateExit.listen(_deletePauseEvents);
     events.onResume.listen(_deletePauseEvents);
@@ skipping 27 matching lines @@
     }
 
     // TODO(turnidge): Report this failure via analytics.
     Logger.root.warning('Caught exception: ${e}\n${st}');
     notifications.add(new ExceptionNotification(e, stacktrace: st));
   }
 
   // This map keeps track of which curly-blocks have been expanded by the user.
   Map<String, bool> expansions = {};
 }