Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f

* changes:
  Merge WebKit at r78450: Update ThirdPartyProject.prop
  Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
  Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
  Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
  Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
  Merge WebKit at r78450: FrameLoader::url() removed
  Merge WebKit at r78450: HTMLParserQuirks removed
  Merge WebKit at r78450: TextRun::padding() renamed
  Merge WebKit at r78450: Use new FontMetrics
  Merge WebKit at r78450: GraphicsContext current path removed
  Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
  Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
  Merge WebKit at r78450: IntRect::bottom()/right() renamed
  Merge WebKit at r78450: Fix remaining conflicts
  Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
  Merge WebKit at r78450: Fix conflicts in media controls
  Merge WebKit at r78450: Fix Makefiles
  Merge WebKit at r78450: Initial merge by git.

1 files changed, 0 insertions, 14 deletions

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
index 72f2d05..ef90484 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
@@ -224,19 +224,6 @@ class PortTest(unittest.TestCase):
         port = base.Port()
         self.assertEqual(port.get_option('foo', 'bar'), 'bar')
 
-    def test_set_option_default__unset(self):
-        port = base.Port()
-        port.set_option_default('foo', 'bar')
-        self.assertEqual(port.get_option('foo'), 'bar')
-
-    def test_set_option_default__set(self):
-        options, args = optparse.OptionParser().parse_args([])
-        options.foo = 'bar'
-        port = base.Port(options=options)
-        # This call should have no effect.
-        port.set_option_default('foo', 'new_bar')
-        self.assertEqual(port.get_option('foo'), 'bar')
-
     def test_name__unset(self):
         port = base.Port()
         self.assertEqual(port.name(), None)
@@ -263,7 +250,6 @@ class VirtualTest(unittest.TestCase):
         self.assertVirtual(port.test_platform_name)
         self.assertVirtual(port.results_directory)
         self.assertVirtual(port.test_expectations)
-        self.assertVirtual(port.test_base_platform_names)
         self.assertVirtual(port.test_platform_name)
         self.assertVirtual(port.test_platforms)
         self.assertVirtual(port.test_platform_name_to_name, None)