Revert "Remove retired mac versions from blinkpy."

This reverts commit 0745b831.

Reason for revert: We still have 10.10 bots on the waterfall. This breaks the Mac10.10 bot. See https://ci.chromium.org/p/chromium/builders/ci/Mac10.10%20Tests/56807 and the blink_python_tests . Sample error:

[1690/1762] blinkpy.web_tests.servers.cli_wrapper_unittest.CliWrapperTest.test_main_server_error_after_start failed unexpectedly:
  Traceback (most recent call last):
    File "/b/s/w/ir/third_party/blink/tools/blinkpy/web_tests/servers/cli_wrapper_unittest.py", line 54, in test_main_server_error_after_start
      argv=[])
    File "/b/s/w/ir/third_party/blink/tools/blinkpy/web_tests/servers/cli_wrapper.py", line 87, in main
      port_obj = host.port_factory.get(options=options)
    File "/b/s/w/ir/third_party/blink/tools/blinkpy/web_tests/port/factory.py", line 91, in get
      self._host, port_name, options=options, **kwargs)
    File "/b/s/w/ir/third_party/blink/tools/blinkpy/web_tests/port/mac.py", line 71, in __init__
      assert self._version in self.SUPPORTED_VERSIONS
  AssertionError


Original change's description:
> Remove retired mac versions from blinkpy.
> 
> This cl removes blinkpy support for Mac10.10, Mac10.11, and Mac Retina.
> blink web tests for these versions has been removed from waterfall.
> 
> Bug: 1077312, 1107003, 1114680
> Change-Id: I819d0bf7316119b2f5bc127f6eda1deaba7e0cd9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343548
> Commit-Queue: Ilia Samsonov <isamsonov@google.com>
> Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#796476}

TBR=wangxianzhu@chromium.org,isamsonov@google.com

Change-Id: I196b5f27ab989ea18e0ebccf2164f578826b6a68
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1077312
Bug: 1107003
Bug: 1114680
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2347326Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796571}

third_party/blink/tools/blinkpy/common/checkout/baseline_optimizer_unittest.py

@@ -83,14 +83,22 @@ class BaselineOptimizerTest(unittest.TestCase):
                 'port_name': 'mac-mac10.12',
                 'specifiers': ['Mac10.12', 'Release']
             },
+            'Fake Test Mac10.11': {
+                'port_name': 'mac-mac10.11',
+                'specifiers': ['Mac10.11', 'Release']
+            },
+            'Fake Test Mac10.10': {
+                'port_name': 'mac-mac10.10',
+                'specifiers': ['Mac10.10', 'Release']
+            },
         })
         # Note: this is a pre-assumption of the tests in this file. If this
         # assertion fails, port configurations are likely changed, and the
         # tests need to be adjusted accordingly.
         self.assertEqual(
             sorted(self.host.port_factory.all_port_names()), [
-                'linux-trusty', 'mac-mac10.12', 'mac-mac10.13', 'mac-mac10.14',
-                'mac-mac10.15', 'win-win10'
+                'linux-trusty', 'mac-mac10.10', 'mac-mac10.11', 'mac-mac10.12',
+                'mac-mac10.13', 'mac-mac10.14', 'mac-mac10.15', 'win-win10'
             ])
 
     def _assert_optimization(self,
@@ -193,18 +201,18 @@ class BaselineOptimizerTest(unittest.TestCase):
         self._assert_optimization({
             'platform/mac': '1',
             'platform/linux': '1',
-            'platform/mac-mac10.14': '1',
+            'platform/mac-mac10.11': '1',
         }, {
             'platform/mac': '1',
             'platform/linux': '1',
         })
 
     def test_local_optimization_skipping_a_port_in_the_middle(self):
-        # mac-mac10.13 -> mac-mac10.14 -> mac
+        # mac-mac10.10 -> mac-mac10.11 -> mac
         self._assert_optimization({
             'platform/mac': '1',
             'platform/linux': '1',
-            'platform/mac-mac10.13': '1',
+            'platform/mac-mac10.10': '1',
         }, {
             'platform/mac': '1',
             'platform/linux': '1',

third_party/blink/tools/blinkpy/common/config/builders.json

@@ -14,6 +14,16 @@
         "port_name": "linux-trusty",
         "specifiers": ["Trusty", "Debug"]
     },
+    "Mac10.10 Tests": {
+        "master": "chromium.mac",
+        "port_name": "mac-mac10.10",
+        "specifiers": ["Mac10.10", "Release"]
+    },
+    "Mac10.11 Tests": {
+        "master": "chromium.mac",
+        "port_name": "mac-mac10.11",
+        "specifiers": ["Mac10.11", "Release"]
+    },
     "Mac10.12 Tests": {
         "master": "chromium.mac",
         "port_name": "mac-mac10.12",
@@ -62,6 +72,18 @@
         "has_webdriver_tests": true,
         "is_try_builder": true
     },
+    "mac10.10-blink-rel": {
+        "master": "tryserver.blink",
+        "port_name": "mac-mac10.10",
+        "specifiers": ["Mac10.10", "Release"],
+        "is_try_builder": true
+    },
+    "mac10.11-blink-rel": {
+        "master": "tryserver.blink",
+        "port_name": "mac-mac10.11",
+        "specifiers": ["Mac10.11", "Release"],
+        "is_try_builder": true
+    },
     "mac10.12-blink-rel": {
         "master": "tryserver.blink",
         "port_name": "mac-mac10.12",

third_party/blink/tools/blinkpy/common/system/platform_info_mock.py

@@ -30,7 +30,7 @@
 class MockPlatformInfo(object):
     def __init__(self,
                  os_name='mac',
-                 os_version='mac10.14',
+                 os_version='mac10.10',
                  linux_distribution=None,
                  is_highdpi=False):
         self.os_name = os_name

third_party/blink/tools/blinkpy/web_tests/port/base.py

@@ -131,6 +131,12 @@ class Port(object):
     CONTENT_SHELL_NAME = 'content_shell'
 
     ALL_SYSTEMS = (
+        # FIXME: We treat Retina (High-DPI) devices as if they are running a different
+        # a different operating system version. This isn't accurate, but will
+        # work until we need to test and support baselines across multiple OS versions.
+        ('retina', 'x86'),
+        ('mac10.10', 'x86'),
+        ('mac10.11', 'x86'),
         ('mac10.12', 'x86'),
         ('mac10.13', 'x86'),
         ('mac10.14', 'x86'),
@@ -145,7 +151,8 @@ class Port(object):
 
     CONFIGURATION_SPECIFIER_MACROS = {
         'mac':
-        ['mac10.12', 'mac10.13', 'mac10.14', 'mac10.15'],
+        ['retina', 'mac10.10', 'mac10.11', 'mac10.12', 'mac10.13', 'mac10.14',
+         'mac10.15'],
         'win': ['win7', 'win10'],
         'linux': ['trusty'],
         'fuschia': ['fuchsia'],

third_party/blink/tools/blinkpy/web_tests/port/browser_test_unittest.py

@@ -89,7 +89,7 @@ class BrowserTestWinTest(_BrowserTestTestCaseMixin,
 class BrowserTestMacTest(_BrowserTestTestCaseMixin,
                          port_testcase.PortTestCase):
     os_name = 'mac'
-    os_version = 'mac10.14'
+    os_version = 'mac10.11'
     port_name = 'mac'
     port_maker = browser_test.BrowserTestMacPort
     driver_name_endswith = 'browser_tests'

third_party/blink/tools/blinkpy/web_tests/port/factory_unittest.py

@@ -62,7 +62,7 @@ class FactoryTest(unittest.TestCase):
         self.assert_port(
             port_name='mac',
             os_name='mac',
-            os_version='mac10.14',
+            os_version='mac10.11',
             cls=mac.MacPort)
 
     def test_linux(self):

third_party/blink/tools/blinkpy/web_tests/port/mac.py

@@ -35,8 +35,9 @@ _log = logging.getLogger(__name__)
 
 
 class MacPort(base.Port):
-    SUPPORTED_VERSIONS = ('mac10.12', 'mac10.13', 'mac10.14', 'mac10.15',
-                          'mac10.16', 'mac11.0')
+    SUPPORTED_VERSIONS = ('mac10.10', 'mac10.11', 'mac10.12', 'mac10.13',
+                          'mac10.14', 'mac10.15', 'mac10.16', 'mac11.0',
+                          'retina')
     port_name = 'mac'
 
     # FIXME: We treat Retina (High-DPI) devices as if they are running a
@@ -54,6 +55,9 @@ class MacPort(base.Port):
     FALLBACK_PATHS['mac10.14'] = ['mac-mac10.14'] + FALLBACK_PATHS['mac10.15']
     FALLBACK_PATHS['mac10.13'] = ['mac-mac10.13'] + FALLBACK_PATHS['mac10.14']
     FALLBACK_PATHS['mac10.12'] = ['mac-mac10.12'] + FALLBACK_PATHS['mac10.13']
+    FALLBACK_PATHS['mac10.11'] = ['mac-mac10.11'] + FALLBACK_PATHS['mac10.12']
+    FALLBACK_PATHS['mac10.10'] = ['mac-mac10.10'] + FALLBACK_PATHS['mac10.11']
+    FALLBACK_PATHS['retina'] = ['mac-retina'] + FALLBACK_PATHS['mac10.13']
 
     CONTENT_SHELL_NAME = 'Content Shell'