Rename last two virtual test suites to complete VirtualTestSuite refactoring.

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

Index: Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
index ac09cca50f2fe4df22f75336c20b37d450d3eb69..72da311fb2c8167b843f3792e0d158b0dff0afac 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
@@ -362,7 +362,7 @@ class PortTest(unittest.TestCase):
 
         self.assertTrue(port.test_exists('virtual'))
         self.assertFalse(port.test_exists('virtual/does_not_exist.html'))
-        self.assertTrue(port.test_exists('virtual/passes/text.html'))
+        self.assertTrue(port.test_exists('virtual/virtual_passes/passes/text.html'))
 
     def test_test_isfile(self):
         port = self.make_port(with_tests=True)
@@ -371,7 +371,7 @@ class PortTest(unittest.TestCase):
         self.assertFalse(port.test_isfile('passes/does_not_exist.html'))
 
         self.assertFalse(port.test_isfile('virtual'))
-        self.assertTrue(port.test_isfile('virtual/passes/text.html'))
+        self.assertTrue(port.test_isfile('virtual/virtual_passes/passes/text.html'))
         self.assertFalse(port.test_isfile('virtual/does_not_exist.html'))
 
     def test_test_isdir(self):
@@ -384,25 +384,25 @@ class PortTest(unittest.TestCase):
         self.assertTrue(port.test_isdir('virtual'))
         self.assertFalse(port.test_isdir('virtual/does_not_exist.html'))
         self.assertFalse(port.test_isdir('virtual/does_not_exist/'))
-        self.assertFalse(port.test_isdir('virtual/passes/text.html'))
+        self.assertFalse(port.test_isdir('virtual/virtual_passes/passes/text.html'))
 
     def test_tests(self):
         port = self.make_port(with_tests=True)
         tests = port.tests([])
         self.assertIn('passes/text.html', tests)
-        self.assertIn('virtual/passes/text.html', tests)
+        self.assertIn('virtual/virtual_passes/passes/text.html', tests)
 
         tests = port.tests(['passes'])
         self.assertIn('passes/text.html', tests)
-        self.assertIn('passes/passes/test-virtual-passes.html', tests)
-        self.assertNotIn('virtual/passes/text.html', tests)
+        self.assertIn('passes/virtual_passes/test-virtual-passes.html', tests)
+        self.assertNotIn('virtual/virtual_passes/passes/text.html', tests)
 
-        tests = port.tests(['virtual/passes'])
+        tests = port.tests(['virtual/virtual_passes/passes'])
         self.assertNotIn('passes/text.html', tests)
-        self.assertIn('virtual/passes/test-virtual-passes.html', tests)
-        self.assertIn('virtual/passes/passes/test-virtual-passes.html', tests)
-        self.assertNotIn('virtual/passes/test-virtual-virtual/passes.html', tests)
-        self.assertNotIn('virtual/passes/virtual/passes/test-virtual-passes.html', tests)
+        self.assertIn('virtual/virtual_passes/passes/test-virtual-passes.html', tests)
+        self.assertNotIn('passes/test-virtual-passes.html', tests)
+        self.assertNotIn('virtual/virtual_passes/passes/test-virtual-virtual/passes.html', tests)
+        self.assertNotIn('virtual/virtual_passes/passes/virtual_passes/passes/test-virtual-passes.html', tests)
 
     def test_build_path(self):
         port = self.make_port(options=optparse.Values({'build_directory': '/my-build-directory/'}))
@@ -422,8 +422,7 @@ class PortTest(unittest.TestCase):
         port = self.make_port()
         fs = port._filesystem
         fs.write_text_file(fs.join(port.layout_tests_dir(), 'VirtualTestSuites'),
-                           '[{"prefix": "foo", "base": "fast/foo", "args": ["--foo"]},'
-                           '{"name": "bar", "base": "fast/bar", "args": ["--bar"]}]')
+                           '[{"prefix": "bar", "base": "fast/bar", "args": ["--bar"]}]')
 
         # If this call returns successfully, we found and loaded the LayoutTests/VirtualTestSuites.
         _ = port.virtual_test_suites()
@@ -492,9 +491,3 @@ class VirtualTestSuiteTest(unittest.TestCase):
 
     def test_no_slash(self):
         self.assertRaises(AssertionError, VirtualTestSuite, prefix='suite/bar', base='base/foo', args=['--args'])
-
-    def test_legacy(self):
-        suite = VirtualTestSuite(name='suite/bar', base='base/foo', args=['--args'])
-        self.assertEqual(suite.name, 'virtual/suite/bar')
-        self.assertEqual(suite.base, 'base/foo')
-        self.assertEqual(suite.args, ['--args'])