Rename last two virtual test suites to complete VirtualTestSuite refactoring.

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 1675 matching lines @@
             except OSError:
                 pass
         return True
 
     def _chromium_baseline_path(self, platform):
         if platform is None:
             platform = self.name()
         return self.path_from_webkit_base('LayoutTests', 'platform', platform)
 
 class VirtualTestSuite(object):
-    def __init__(self, prefix=None, name=None, base=None, args=None):
+    def __init__(self, prefix=None, base=None, args=None):
         assert base
         assert args
-        # TODO(dpranke): Rename the legacy virtual test suites and update the expectations.
-        if name:
-            self.name = 'virtual/' + name
-        else:
-            assert prefix.find('/') == -1, "Virtual test suites prefixes cannot contain /'s: %s" % prefix
-            self.name = 'virtual/' + prefix + '/' + base
+        assert prefix.find('/') == -1, "Virtual test suites prefixes cannot contain /'s: %s" % prefix
+        self.name = 'virtual/' + prefix + '/' + base
         self.base = base
         self.args = args
         self.tests = {}
 
     def __repr__(self):
         return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)
 
 
 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)