Update unittest to new package layout.

samples/tests/samples/dartcombat/dartcombat_test.dart

 // Copyright (c) 2011, 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('dartcombat_tests');
 
 #import('dart:html');
 #import('dart:isolate');
-#import('../../../../pkg/unittest/unittest.dart');
-#import('../../../../pkg/unittest/html_config.dart');
+#import('../../../../pkg/unittest/lib/unittest.dart');
+#import('../../../../pkg/unittest/lib/html_config.dart');
 #import('../../../dartcombat/dartcombatlib.dart');
 
 ReceivePort testPort;
 
 main() {
   useHtmlConfiguration();
   testPort = new ReceivePort();
 
   setupUI();
   // add relative URL to stylesheet to the correct location. Note: The CSS is
@@ skipping 84 matching lines @@
         List<int> expectedShots = const [
           Constants.HIT,  8, 4,  // initial shot (center)
           Constants.MISS, 7, 4,  // left  (miss - stop this direction)
           Constants.MISS, 9, 4,  // right (miss - stop this direction)
           Constants.HIT,  8, 3,  // up
           Constants.MISS, 8, 2,  // up    (miss - stop this direction)
           Constants.HIT,  8, 5,  // down
           Constants.HIT,  8, 6,  // down
           Constants.SUNK, 8, 7]; // down  (sunk - done)
         _expectShotSequence(expectedShots, p2OwnBoard, 2, callback);
-  
+
         // hit the boat from the enemy side.
         var p1EnemyBoard = document.query("#p1enemy");
         var hitCell = p1EnemyBoard.nodes[0].nodes[4].nodes[8];
         doMouseEvent("click", hitCell);
       }
     ]);
   });
 }
 
 _expectShotSequence(List<int> expectedShots, Element playerBoard,
@@ skipping 42 matching lines @@
     void invokeNext() {
       closures[i]();
       i++;
       if (i < length) {
         window.setTimeout(expectAsync0(invokeNext), 0);
       }
     }
     window.setTimeout(expectAsync0(invokeNext), 0);
   }
 }