Update unittest to new package layout.

samples/tests/samples/lib/layout/layout_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('layout_tests');
 
 #import('dart:html');
 #import('../../../../ui_lib/base/base.dart');
 #import('../../../../ui_lib/layout/layout.dart');
 #import('../../../../ui_lib/view/view.dart');
 #import('../../../../ui_lib/util/utilslib.dart');
-#import('../../../../../pkg/unittest/unittest.dart');
-#import('../../../../../pkg/unittest/html_config.dart');
+#import('../../../../../pkg/unittest/lib/unittest.dart');
+#import('../../../../../pkg/unittest/lib/html_config.dart');
 
 #source('grid_layout_demo.dart');
 #source('grid_examples.dart');
 #source('css.dart');
 
 // TODO(jmesserly): these tests would be easier to work with if they were WebKit
 // layout tests. The way DumpRenderTree works is exactly what we want for
 // testing layout: run the example and then print the element tree with metrics.
 // The UnitTestSuite wrapper gets in our way here, because you can't "see" the
 // test layout visually when you're debugging.
@@ skipping 128 matching lines @@
 
 // Note: to debug failures, best bet is to use GridLayoutDemo to run an
 // individual asyncTest and see the resulting layout.
 
 usingGrid(String example, void test_(View grid)) {
   final grid = createGrid(GridExamples.styles[example]);
   grid.addToDocument(document.body);
   window.setTimeout(() {
     test_(grid);
     window.setTimeout(expectAsync0(() { grid.removeFromDocument(); }), 0);
-  }, 0); 
+  }, 0);
 }
 
 verifyGrid(String example, [Map expected = null]) {
   printMetrics(example);
   if (expected == null) {
     return;
   }
 
   for (String name in expected.getKeys()) {
     final values = expected[name];
     final node = document.body.query('#$name');
     Expect.isNotNull(node);
     node.rect.then(expectAsync0((rect) {
       final offset = rect.offset;
       Expect.equals(values[0], offset.left);
       Expect.equals(values[1], offset.top);
       Expect.equals(values[2], offset.width);
       Expect.equals(values[3], offset.height);
     }));
   }
 }
 
 verifyExample(String example, [Map expected = null]) {
   usingGrid(example, (grid) => verifyGrid(example, expected));
 }