Update charted to 0.4.8 and roll

packages/watcher/test/directory_watcher/shared.dart

 // Copyright (c) 2012, 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.
 
 import 'package:scheduled_test/scheduled_test.dart';
 import 'package:watcher/src/utils.dart';
 
 import '../utils.dart';
 
 void sharedTests() {
@@ skipping 74 matching lines @@
     startWatcher(path: "dir");
 
     renameDir("dir", "moved_dir");
     createDir("dir");
     inAnyOrder([
       isRemoveEvent("dir/a.txt"),
       isRemoveEvent("dir/b.txt")
     ]);
   });
 
+  // Regression test for b/30768513.
+  test("doesn't crash when the directory is moved immediately after a subdir "
+      "is added", () {
+    writeFile("dir/a.txt");
+    writeFile("dir/b.txt");
+
+    startWatcher(path: "dir");
+
+    createDir("dir/subdir");
+    renameDir("dir", "moved_dir");
+    createDir("dir");
+    inAnyOrder([
+      isRemoveEvent("dir/a.txt"),
+      isRemoveEvent("dir/b.txt")
+    ]);
+  });
+
   group("moves", () {
     test('notifies when a file is moved within the watched directory', () {
       writeFile("old.txt");
       startWatcher();
       renameFile("old.txt", "new.txt");
 
       inAnyOrder([
         isAddEvent("new.txt"),
         isRemoveEvent("old.txt")
       ]);
@@ skipping 134 matching lines @@
       renameDir("old", "new");
       inAnyOrder([
         isRemoveEvent("old/file.txt"),
         isAddEvent("new/file.txt")
       ]);
 
       writeFile("new/file.txt", contents: "modified");
       expectModifyEvent("new/file.txt");
     });
 
+    test('notifies when a file is replaced by a subdirectory', () {
+      writeFile("new");
+      writeFile("old/file.txt");
+      startWatcher();
+
+      deleteFile("new");
+      renameDir("old", "new");
+      inAnyOrder([
+        isRemoveEvent("new"),
+        isRemoveEvent("old/file.txt"),
+        isAddEvent("new/file.txt")
+      ]);
+    });
+
+    test('notifies when a subdirectory is replaced by a file', () {
+      writeFile("old");
+      writeFile("new/file.txt");
+      startWatcher();
+
+      renameDir("new", "newer");
+      renameFile("old", "new");
+      inAnyOrder([
+        isRemoveEvent("new/file.txt"),
+        isAddEvent("newer/file.txt"),
+        isRemoveEvent("old"),
+        isAddEvent("new")
+      ]);
+    }, onPlatform: {
+      "mac-os": new Skip("https://github.com/dart-lang/watcher/issues/21")
+    });
+
     test('emits events for many nested files added at once', () {
       withPermutations((i, j, k) =>
           writeFile("sub/sub-$i/sub-$j/file-$k.txt"));
 
       createDir("dir");
       startWatcher(path: "dir");
       renameDir("sub", "dir/sub");
 
       inAnyOrder(withPermutations((i, j, k)  =>
           isAddEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
@@ skipping 42 matching lines @@
       deleteFile("dir/sub");
       renameDir("old", "dir/sub");
 
       var events = withPermutations((i, j, k)  =>
           isAddEvent("dir/sub/sub-$i/sub-$j/file-$k.txt"));
       events.add(isRemoveEvent("dir/sub"));
       inAnyOrder(events);
     });
   });
 }