Also remove Library/Safari from users home dir if --clear_safari_cache is set

tools/testing/dart/browser_controller.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.
 library browser;
 
 import "dart:async";
 import "dart:core";
 import "dart:io";
 
 import 'android.dart';
@@ skipping 165 matching lines @@
    * The binary used to run safari - changing this can be nececcary for
    * testing or using non standard safari installation.
    */
   const String binary = "/Applications/Safari.app/Contents/MacOS/Safari";
 
   /**
    * We get the safari version by parsing a version file
    */
   const String versionFile = "/Applications/Safari.app/Contents/version.plist";
 
+  /**
+   * Directories where safari stores state. We delete these if the deleteCache
+   * is set
+   */
+  static const List<String> CACHE_DIRECTORIES =
+      const ["Library/Caches/com.apple.Safari",
+             "Library/Safari"];
+
+
   Future<bool> allowPopUps() {
     var command = "defaults";
     var args = ["write", "com.apple.safari",
                 "com.apple.Safari.ContentPageGroupIdentifier."
                 "WebKit2JavaScriptCanOpenWindowsAutomatically",
                 "1"];
     return Process.run(command, args).then((result) {
       if (result.exitCode != 0) {
         _logEvent("Could not disable pop-up blocking for safari");
         return false;
       }
       return true;
     });
   }
 
+  Future<bool> deleteIfExists(Iterator<String> paths) {
+    if (!paths.moveNext()) return new Future.immediate(true);
+    Directory directory = new Directory(paths.current);
+    return directory.exists().then((exists) {
+      if (exists) {
+        _logEvent("Deleting ${paths.current}");
+        return directory.delete(recursive: true)
+            .then((_) => deleteIfExists(paths))
+            .catchError((error) {
+              _logEvent("Failure trying to delete ${paths.current}: $error");
+              return false;
+            });
+      } else {
+        _logEvent("${paths.current} is not present");
+        return deleteIfExists(paths);
+      }
+    });
+  }
+
   // Clears the cache if the static deleteCache flag is set.
   // Returns false if the command to actually clear the cache did not complete.
   Future<bool> clearCache() {
     if (!deleteCache) return new Future.immediate(true);
     var home = Platform.environment['HOME'];
-    var cache = "$home/Library/Caches/com.apple.Safari";
-    _logEvent("Clearing safari cache: $cache}");
-    return new Directory(cache).delete(recursive: true)
-        .then((_) => true)
-        // This normally means that the directory was not there.
-        .catchError((error) => true);
+    Iterator iterator = CACHE_DIRECTORIES.map((s) => "$home/$s").iterator;
+    return deleteIfExists(iterator);
   }
 
   Future<String> getVersion() {
     /**
      * Example of the file:
      * <?xml version="1.0" encoding="UTF-8"?>
      * <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
      * <plist version="1.0">
      * <dict>
      *       <key>BuildVersion</key>
@@ skipping 27 matching lines @@
     var randomFile = file.openSync(FileMode.WRITE);
     var content = '<script language="JavaScript">location = "$url"</script>';
     randomFile.writeStringSync(content);
     randomFile.close();
   }
 
   Future<bool> start(String url) {
     _logEvent("Starting Safari browser on: $url");
     return allowPopUps().then((success) {
       if (!success) {
-        return new Future.immediate(false);
+        return false;
       }
-      return clearCache().then((_) {
+      return clearCache().then((cleared) {
+        if (!cleared) {
+          _logEvent("Could not clear cache");
+          return false;
+        }
         // Get the version and log that.
         return getVersion().then((version) {
           _logEvent("Got version: $version");
           return new Directory('').createTemp().then((userDir) {
             _cleanup = () { userDir.deleteSync(recursive: true); };
             _createLaunchHTML(userDir.path, url);
             var args = ["${userDir.path}/launch.html"];
             return startBrowser(binary, args);
           });
         }).catchError((error) {
@@ skipping 753 matching lines @@
 </head>
   <body onload="startTesting()">
     Dart test driver, number of tests: <div id="number"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }