Don't duplicate virtual and non-virtual baselines.

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
index 01dccecb13b97755635a590d22e007af509fd14d..73b8335a46c603cd3920ee053aebe7a8943be485 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
@@ -108,6 +108,12 @@ class BaselineOptimizerTest(unittest.TestCase):
             if contents is not None:
                 self.assertEqual(fs.read_binary_file(path), contents)
 
+        # Check that the files that were in the original set have been deleted where necessary.
+        for dirname in results_by_directory:
+            path = fs.join(webkit_base, 'LayoutTests', dirname, baseline_name)
+            if dirname not in expected_new_results_by_directory:
+                self.assertFalse(fs.exists(path))
+
     def test_linux_redundant_with_win(self):
         self._assertOptimization(
             {
@@ -160,7 +166,7 @@ class BaselineOptimizerTest(unittest.TestCase):
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
-                'platform/linux-precise': '1',
+                'platform/android': '1',
             },
             {
                 'platform/mac': '1',
@@ -173,7 +179,7 @@ class BaselineOptimizerTest(unittest.TestCase):
                 'platform/mac-snowleopard': '1',
                 'platform/win': '1',
                 'platform/linux': '1',
-                'platform/linux-precise': '1',
+                'platform/android': '1',
             },
             {
                 'platform/mac-snowleopard': '1',
@@ -278,3 +284,14 @@ class BaselineOptimizerTest(unittest.TestCase):
                 'platform/mac/fast/canvas': '1',
             },
             baseline_dirname='virtual/gpu/fast/canvas')
+
+    def test_virtual_redundant_with_actual(self):
+        self._assertOptimization(
+            {
+                'platform/mac/virtual/gpu/fast/canvas': '1',
+                'platform/mac/fast/canvas': '1',
+            },
+            {
+                'platform/mac/fast/canvas': '1',
+            },
+            baseline_dirname='virtual/gpu/fast/canvas')