Move core/layout/style to core/style

Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py

 # Copyright (C) 2009 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 23 matching lines @@
 from webkitpy.common.checkout.diff_test_data import DIFF_TEST_DATA
 
 class DiffParserTest(unittest.TestCase):
     maxDiff = None
 
     def test_diff_parser(self, parser = None):
         if not parser:
             parser = diff_parser.DiffParser(DIFF_TEST_DATA.splitlines())
         self.assertEqual(3, len(parser.files))
 
-        self.assertTrue('WebCore/layout/style/StyleFlexibleBoxData.h' in parser.files)
-        diff = parser.files['WebCore/layout/style/StyleFlexibleBoxData.h']
+        self.assertTrue('WebCore/style/StyleFlexibleBoxData.h' in parser.files)
+        diff = parser.files['WebCore/style/StyleFlexibleBoxData.h']
         self.assertEqual(7, len(diff.lines))
         # The first two unchaged lines.
         self.assertEqual((47, 47), diff.lines[0][0:2])
         self.assertEqual('', diff.lines[0][2])
         self.assertEqual((48, 48), diff.lines[1][0:2])
         self.assertEqual('    unsigned align : 3; // EBoxAlignment', diff.lines[1][2])
         # The deleted line
         self.assertEqual((50, 0), diff.lines[3][0:2])
         self.assertEqual('    unsigned orient: 1; // EBoxOrient', diff.lines[3][2])
 
         # The first file looks OK. Let's check the next, more complicated file.
-        self.assertTrue('WebCore/layout/style/StyleRareInheritedData.cpp' in parser.files)
-        diff = parser.files['WebCore/layout/style/StyleRareInheritedData.cpp']
+        self.assertTrue('WebCore/style/StyleRareInheritedData.cpp' in parser.files)
+        diff = parser.files['WebCore/style/StyleRareInheritedData.cpp']
         # There are 3 chunks.
         self.assertEqual(7 + 7 + 9, len(diff.lines))
         # Around an added line.
         self.assertEqual((60, 61), diff.lines[9][0:2])
         self.assertEqual((0, 62), diff.lines[10][0:2])
         self.assertEqual((61, 63), diff.lines[11][0:2])
         # Look through the last chunk, which contains both add's and delete's.
         self.assertEqual((81, 83), diff.lines[14][0:2])
         self.assertEqual((82, 84), diff.lines[15][0:2])
         self.assertEqual((83, 85), diff.lines[16][0:2])
@@ skipping 97 matching lines @@
  A
  B
  C
 +D
  E
  F
 """)
 
         self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_diff(x) for x in shortfmt.readlines()))
         self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_diff(x) for x in inputfmt.readlines()))