Don't duplicate virtual and non-virtual baselines.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
index 14e56778b70fd9a0f88164935bbb8c56f92f0d9c..c9e8b5dd27ebb71842d1ea9d1bce0b507e716a75 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
@@ -81,10 +81,19 @@ class BaselineOptimizer(object):
         return self._default_port.lookup_virtual_test_base(baseline_name)
 
     def _relative_baseline_search_paths(self, port, baseline_name):
-        baseline_search_path = self._baseline_search_path(port, baseline_name)
-        baseline_root = self._baseline_root(baseline_name)
-        relative_paths = [self._filesystem.relpath(path, self._webkit_base) for path in baseline_search_path]
-        return relative_paths + [baseline_root]
+        directories = self._baseline_search_path(port, baseline_name)
+        directories = [self._filesystem.relpath(path, self._webkit_base) for path in directories]
+        directories.append(self._baseline_root(baseline_name))

[Dirk Pranke, 2016/12/18 04:26:00]

Stylistically, I don't tend to like repeatedly modifying variables
in place like this. I'd probably write this as something more like:

directories = ([self._filesystem.replath(path, self._webkit_base)
                for path in self._baseline_search_path(port, baseline_name)] + 
               [self._baseline_root(baseline_name)])

+
+        virtual_suite = self._virtual_suite(baseline_name)
+        if virtual_suite:
+            non_virtual_directories = port.baseline_search_path()
+            non_virtual_directories = [self._filesystem.relpath(path, self._webkit_base) for path in non_virtual_directories]
+            non_virtual_directories.append(self.ROOT_LAYOUT_TESTS_DIRECTORY)
+            non_virtual_directories = [self._filesystem.join(path, virtual_suite.base) for path in non_virtual_directories]
+            directories += non_virtual_directories

[Dirk Pranke, 2016/12/18 04:26:00]

and similar.

+
+        return directories
 
     def _join_directory(self, directory, baseline_name):
         # This code is complicated because both the directory name and the baseline_name have the virtual