fixes for latest trunk sdk

Author: John Messerly

.gitignore

@@ -5,3 +5,4 @@ tags
 out
 .DS_Store
 *.pyc
+.buildlog

client/lib/model.dart

@@ -237,15 +237,13 @@ Future loadModel() {
   md.setImplicitLinkResolver(_resolveNameReference);
   var completer = new Completer();
   library_loader.libraryLoader = (url, callback) {
-    new html.HttpRequest.get(url, (req) {
-      callback(req.responseText);
-    });
+    html.HttpRequest.getString(url).then(callback);
   };
   library_loader.onDataModelChanged = _onDataModelChanged;
 
   // TODO(jacobr): shouldn't have to get this from the parent directory.
-  new html.HttpRequest.get('../static/data/apidoc.json', (req) {
-    loadPackageJson(req.responseText);
+  html.HttpRequest.getString('../static/data/apidoc.json').then((text) {
+    loadPackageJson(text);
     _onDataModelChanged();
     completer.complete(true);
   });

client/test/ast_test.dart

@@ -8,9 +8,9 @@
  */
 library ast_test;
 
+import 'package:unittest/compact_vm_config.dart';
 import 'package:unittest/unittest.dart';
 import 'package:api_doc/ast.dart';
-import 'compact_vm_config.dart';
 import 'dart:io';
 
 main() {

client/test/compact_vm_config.dart

@@ -8,14 +8,15 @@
  */
 library run_impl;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:utf' show encodeUtf8;
 import 'dart:isolate';
+import 'package:unittest/compact_vm_config.dart';
 import 'package:unittest/unittest.dart';
 import 'package:web_ui/dwc.dart' as dwc;
 
 import 'ast_test.dart' as ast_test;
-import 'compact_vm_config.dart';
 
 // TODO(jacobr): command line args to filter tests
 main() {
@@ -42,7 +43,7 @@ main() {
 
     test('drt-compile $filename', () {
       expect(dwc.run(['-o', 'data/output/', path], printTime: false)
-        .transform((res) {
+        .then((res) {
           expect(res.messages.length, 0,
               reason: Strings.join(res.messages, '\n'));
         }), completes);
@@ -54,14 +55,14 @@ main() {
       var outputPath = '$htmlPath.txt';
       var errorPath = outDir.append('_errors.$filename.txt').toString();
 
-      expect(_runDrt(htmlPath, outputPath, errorPath).transform((exitCode) {
+      expect(_runDrt(htmlPath, outputPath, errorPath).then((exitCode) {
         if (exitCode == 0) {
           var expectedPath = '$cwd/data/expected/$filename.txt';
-          expect(_diff(expectedPath, outputPath).transform((res) {
+          expect(_diff(expectedPath, outputPath).then((res) {
               expect(res, 0, reason: "Test output doesn't match expectation.");
             }), completes);
         } else {
-          expect(Process.run('cat', [errorPath]).transform((res) {
+          expect(Process.run('cat', [errorPath]).then((res) {
             expect(exitCode, 0, reason:
               'DumpRenderTree exited with a non-zero exit code, when running '
               'on $filename. Contents of stderr: \n${res.stdout}');
@@ -73,20 +74,20 @@ main() {
 }
 
 Future<int> _runDrt(htmlPath, String outPath, String errPath) {
-  return Process.run('DumpRenderTree', [htmlPath]).chain((res) {
+  return Process.run('DumpRenderTree', [htmlPath]).then((res) {
     var f1 = _writeFile(outPath, res.stdout);
     var f2 = _writeFile(errPath, res.stderr);
-    return Futures.wait([f1, f2]).transform((_) => res.exitCode);
+    return Future.wait([f1, f2]).then((_) => res.exitCode);
   });
 }
 
 Future _writeFile(String path, String text) {
   return new File(path).open(FileMode.WRITE)
-      .chain((file) => file.writeString(text))
-      .chain((file) => file.close());
+      .then((file) => file.writeString(text))
+      .then((file) => file.close());
 }
 
 Future<int> _diff(expectedPath, outputPath) {
   return Process.run('diff', ['-q', expectedPath, outputPath])
-      .transform((res) => res.exitCode);
+      .then((res) => res.exitCode);
 }