Don't duplicate virtual and non-virtual baselines.

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

 # Copyright (C) 2011 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 90 matching lines @@
 
         baseline_optimizer = BaselineOptimizer(host, host.port_factory.get(
         ), host.port_factory.all_port_names())
         self.assertTrue(baseline_optimizer.optimize(fs.join(baseline_dirname, baseline_name)))
 
         for dirname, contents in expected_new_results_by_directory.items():
             path = fs.join(webkit_base, 'LayoutTests', dirname, baseline_name)
             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(
             {
                 'platform/win': '1',
                 'platform/linux': '1',
             },
             {
                 'platform/win': '1',
             })
 
@@ skipping 32 matching lines @@
                 'platform/mac': '1',
                 'platform/linux': '1',
                 '': '2',
             })
 
     def test_local_optimization(self):
         self._assertOptimization(
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
-                'platform/linux-precise': '1',
+                'platform/android': '1',
             },
             {
                 'platform/mac': '1',
                 'platform/linux': '1',
             })
 
     def test_local_optimization_skipping_a_port_in_the_middle(self):
         self._assertOptimization(
             {
                 'platform/mac-snowleopard': '1',
                 'platform/win': '1',
                 'platform/linux': '1',
-                'platform/linux-precise': '1',
+                'platform/android': '1',
             },
             {
                 'platform/mac-snowleopard': '1',
                 'platform/win': '1',
             })
 
     def test_baseline_redundant_with_root(self):
         self._assertOptimization(
             {
                 'platform/mac': '1',
@@ skipping 84 matching lines @@
         self._assertOptimization(
             {
                 'virtual/gpu/fast/canvas': '2',
                 'platform/mac/fast/canvas': '1',
             },
             {
                 'virtual/gpu/fast/canvas': '2',
                 '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')