Fix safari browser to use Future.value

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 80 matching lines @@
     _logEvent("Close called on browser");
     if (process != null) {
       if (process.kill(ProcessSignal.SIGKILL)) {
         _logEvent("Successfully sent kill signal to process.");
       } else {
         _logEvent("Sending kill signal failed.");
       }
       return done;
     } else {
       _logEvent("The process is already dead.");
-      return new Future.immediate(true);
+      return new Future.value(true);
     }
   }
 
   /**
    * Start the browser using the supplied argument.
    * This sets up the error handling and usage logging.
    */
   Future<bool> startBrowser(String command, List<String> arguments) {
     return Process.start(command, arguments).then((startedProcess) {
       process = startedProcess;
@@ skipping 52 matching lines @@
   String toString();
   /** Starts the browser loading the given url */
   Future<bool> start(String url);
 }
 
 class Safari extends Browser {
   /**
    * 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";
+  static 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";
+  static 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",
              "Library/Saved Application State/com.apple.Safari.savedState",
              "Library/Caches/Metadata/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);
+    if (!paths.moveNext()) return new Future.value(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);
+    if (!deleteCache) return new Future.value(true);
     var home = Platform.environment['HOME'];
     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">
@@ skipping 68 matching lines @@
   static bool deleteCache = false;
 
 }
 
 
 class Chrome extends Browser {
   /**
    * The binary used to run chrome - changing this can be nececcary for
    * testing or using non standard chrome installation.
    */
-  const String binary = "google-chrome";
+  static const String binary = "google-chrome";
 
   Future<bool> start(String url) {
     _logEvent("Starting chrome browser on: $url");
     // Get the version and log that.
     return Process.run(binary, ["--version"]).then((var versionResult) {
       if (versionResult.exitCode != 0) {
         _logEvent("Failed to chrome get version");
         _logEvent("Make sure $binary is a valid program for running chrome");
         return new Future.value(false);
       }
@@ skipping 11 matching lines @@
     }).catchError((e) {
       _logEvent("Running $binary --version failed with $e");
       return false;
     });
   }
 
   String toString() => "Chrome";
 }
 
 class AndroidChrome extends Browser {
-  const String viewAction = 'android.intent.action.VIEW';
-  const String mainAction = 'android.intent.action.MAIN';
-  const String chromePackage = 'com.android.chrome';
-  const String browserPackage = 'com.android.browser';
-  const String firefoxPackage = 'org.mozilla.firefox';
-  const String turnScreenOnPackage = 'com.google.dart.turnscreenon';
+  static const String viewAction = 'android.intent.action.VIEW';
+  static const String mainAction = 'android.intent.action.MAIN';
+  static const String chromePackage = 'com.android.chrome';
+  static const String browserPackage = 'com.android.browser';
+  static const String firefoxPackage = 'org.mozilla.firefox';
+  static const String turnScreenOnPackage = 'com.google.dart.turnscreenon';
 
   AndroidEmulator _emulator;
   AdbDevice _adbDevice;
 
   AndroidChrome(this._adbDevice);
 
   Future<bool> start(String url) {
     var browserIntent = new Intent(
         viewAction, browserPackage, '.BrowserActivity', url);
     var chromeIntent = new Intent(viewAction, chromePackage, '.Main', url);
@@ skipping 44 matching lines @@
   }
 
   String toString() => "chromeOnAndroid";
 }
 
 class Firefox extends Browser {
   /**
    * The binary used to run firefox - changing this can be nececcary for
    * testing or using non standard firefox installation.
    */
-  const String binary = "firefox";
+  static const String binary = "firefox";
 
-  const String enablePopUp =
+  static const String enablePopUp =
       'user_pref("dom.disable_open_during_load", false);';
-  const String disableDefaultCheck =
+  static const String disableDefaultCheck =
       'user_pref("browser.shell.checkDefaultBrowser", false);';
 
   Future _createPreferenceFile(var path) {
     var file = new File("${path.toString()}/user.js");
     var randomFile = file.openSync(mode: FileMode.WRITE);
     randomFile.writeStringSync(enablePopUp);
     randomFile.writeStringSync(disableDefaultCheck);
     randomFile.close();
   }
 
@@ skipping 334 matching lines @@
   /// GET /next_test/BROWSER_ID -- returns "WAIT" "TERMINATE" or "url#id"
   /// where url is the test to run, and id is the id of the test.
   /// If there are currently no available tests the waitSignal is send
   /// back. If we are in the process of terminating the terminateSignal
   /// is send back and the browser will stop requesting new tasks.
   /// POST /report/BROWSER_ID?id=NUM -- sends back the dom of the executed
   ///                                   test
 
   final String local_ip;
 
-  const String driverPath = "/driver";
-  const String nextTestPath = "/next_test";
-  const String reportPath = "/report";
-  const String waitSignal = "WAIT";
-  const String terminateSignal = "TERMINATE";
+  static const String driverPath = "/driver";
+  static const String nextTestPath = "/next_test";
+  static const String reportPath = "/report";
+  static const String waitSignal = "WAIT";
+  static const String terminateSignal = "TERMINATE";
 
   var testCount = 0;
   var httpServer;
   var errorReportingServer;
   bool underTermination = false;
   bool useIframe = false;
 
   Function testDoneCallBack;
   Function nextTestCallBack;
 
@@ skipping 251 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;
   }
 }