Treat win8 machines as win10 ports and remove baseline/specifier support.

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

 # Copyright (C) 2010 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 66 matching lines @@
         self.assert_name(None, 'xp', 'win-xp')
         self.assert_name('win', 'xp', 'win-xp')
         self.assert_name('win-xp', 'xp', 'win-xp')
         self.assert_name('win-xp', '7sp0', 'win-xp')
 
         self.assert_name(None, '10', 'win-win10')
         self.assert_name('win', '10', 'win-win10')
         self.assert_name('win-win10', '10', 'win-win10')
         self.assert_name('win-win10', 'xp', 'win-win10')
 
-        self.assert_name(None, '8', 'win-win8')
-        self.assert_name(None, '8.1', 'win-win8')
-        self.assert_name('win', '8', 'win-win8')
-        self.assert_name('win', '8.1', 'win-win8')
-        self.assert_name('win-win8', '8', 'win-win8')
-        self.assert_name('win-win8', '8.1', 'win-win8')
-        self.assert_name('win-win8', 'vista', 'win-win8')
+        self.assert_name(None, '8', 'win-win10')
+        self.assert_name(None, '8.1', 'win-win10')
+        self.assert_name('win', '8', 'win-win10')
+        self.assert_name('win', '8.1', 'win-win10')
 
         self.assert_name(None, '7sp1', 'win-win7')
         self.assert_name(None, '7sp0', 'win-win7')
         self.assert_name(None, 'vista', 'win-win7')
         self.assert_name('win', '7sp1', 'win-win7')
         self.assert_name('win', '7sp0', 'win-win7')
         self.assert_name('win', 'vista', 'win-win7')
         self.assert_name('win-win7', '7sp1', 'win-win7')
         self.assert_name('win-win7', '7sp0', 'win-win7')
         self.assert_name('win-win7', 'vista', 'win-win7')
         self.assert_name('win-win7', 'xp', 'win-win7')
 
         self.assert_name(None, 'future', 'win-win10')
         self.assert_name('win', 'future', 'win-win10')
-        self.assert_name('win-win8', 'future', 'win-win8')
         self.assert_name('win-win10', 'future', 'win-win10')
 
         self.assertRaises(AssertionError, self.assert_name, None, 'w2k', 'win-xp')
 
     def assert_baseline_paths(self, port_name, *expected_paths):
         port = self.make_port(port_name=port_name)
         self.assertEqual(port.baseline_path(), port._webkit_baseline_path(expected_paths[0]))
         self.assertEqual(len(port.baseline_search_path()), len(expected_paths))
         for i, path in enumerate(expected_paths):
             self.assertTrue(port.baseline_search_path()[i].endswith(path))
 
     def test_baseline_path(self):
-        self.assert_baseline_paths('win-xp', 'win-xp', '/win7', '/win8', '/win')
-        self.assert_baseline_paths('win-win7', 'win7', 'win8', '/win')
-        self.assert_baseline_paths('win-win8', 'win8', '/win')
+        self.assert_baseline_paths('win-xp', 'win-xp', '/win7', '/win')
+        self.assert_baseline_paths('win-win7', 'win7', '/win')
         self.assert_baseline_paths('win-win10', 'win')
 
     def test_build_path(self):
         # Test that optional paths are used regardless of whether they exist.
         options = MockOptions(configuration='Release', build_directory='/foo')
         self.assert_build_path(options, ['/mock-checkout/out/Release'], '/foo/Release')
 
         # Test that optional relative paths are returned unmodified.
         options = MockOptions(configuration='Release', build_directory='foo')
         self.assert_build_path(options, ['/mock-checkout/out/Release'], 'foo/Release')
@@ skipping 16 matching lines @@
 
     def test_operating_system(self):
         self.assertEqual('win', self.make_port().operating_system())
 
     def test_driver_name_option(self):
         self.assertTrue(self.make_port()._path_to_driver().endswith('content_shell.exe'))
         self.assertTrue(self.make_port(options=MockOptions(driver_name='OtherDriver'))._path_to_driver().endswith('OtherDriver.exe'))
 
     def test_path_to_image_diff(self):
         self.assertEqual(self.make_port()._path_to_image_diff(), '/mock-checkout/out/Release/image_diff.exe')