Revert "Revert "Make Safari tests more robust.""

tools/testing/dart/test_options.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 test_options_parser;
 
 import "dart:io";
 import "drt_updater.dart";
 import "test_suite.dart";
 import "path.dart";
@@ skipping 320 matching lines @@
           type: 'bool'),
       new _TestOptionSpecification(
           'write_test_outcome_log',
           'Write the outcome of all tests executed to a '
           '"${TestUtils.flakyFileName()}" file.',
           ['--write-test-outcome-log'],
           [],
           false,
           type: 'bool'),
       new _TestOptionSpecification(
-          'clear_browser_cache',
-          'Browser specific clearing of caches(i.e., delete it).',
-          ['--clear_browser_cache'],
+          'reset_browser_configuration',
+          'Browser specific reset of configuration. '
+          'WARNING: Using this option may remove your bookmarks and '
+          'other settings.',
+          ['--reset-browser-configuration'],
           [],
           false,
           type: 'bool'),
       new _TestOptionSpecification(
           'copy_coredumps',
           'If we see a crash that we did not expect, copy the core dumps. '
           'to /tmp',
           ['--copy-coredumps'],
           [],
           false,
@@ skipping 543 matching lines @@
       if (option.keys.contains(name)) {
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
   List<_TestOptionSpecification> _options;
 }