Merge virtual mac-antialiasedtext and windows-directwrite test suites

Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 1731 matching lines @@
                              ['--stable-release-mode',
                               '--force-compositing-mode']),
             VirtualTestSuite('stable',
                              'web-animations-api/eased-keyframes.html',
                              ['--stable-release-mode',
                               '--force-compositing-mode']),
             VirtualTestSuite('linux-subpixel',
                              'platform/linux/fast/text/subpixel',
                              ['--enable-webkit-text-subpixel-positioning',
                               '--force-compositing-mode']),
-            # FIXME: Merge with mac-antialiasedtext and rename
-            # antialiasedtext as a separate change once DW has been
-            # enabled for a couple of days.
-            VirtualTestSuite('windows-directwrite',
+            VirtualTestSuite('antialiasedtext',
                              'fast/text',
                              ['--enable-direct-write',
                               '--enable-font-antialiasing',
                               '--force-compositing-mode']),
-            VirtualTestSuite('mac-antialiasedtext',
-                             'fast/text',
-                             ['--enable-font-antialiasing',
-                              '--force-compositing-mode']),
 
         ]
 
     @memoized
     def populated_virtual_test_suites(self):
         suites = self.virtual_test_suites()
 
         # Sanity-check the suites to make sure they don't point to other suites.
         suite_dirs = [suite.name for suite in suites]
         for suite in suites:
@@ skipping 165 matching lines @@
 
 class PhysicalTestSuite(object):
     def __init__(self, base, args):
         self.name = base
         self.base = base
         self.args = args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)