Move core/layout/style to core/style

Source/core/css/CSSCalculationValueTest.cpp

 /*
  * Copyright (c) 2013, 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
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/CSSCalculationValue.h"
 
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/StylePropertySet.h"
-#include "core/layout/style/ComputedStyle.h"
-#include "core/layout/style/StyleInheritedData.h"
+#include "core/style/ComputedStyle.h"
+#include "core/style/StyleInheritedData.h"
 
 #include <gtest/gtest.h>
 
 
 namespace blink {
 
 void PrintTo(const CSSLengthArray& lengthArray, ::std::ostream* os)
 {
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i)
         *os << lengthArray.at(i) << ' ';
@@ skipping 140 matching lines @@
     expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 10;
     EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(1in + 10% - 6px)")));
 
     expectation.at(CSSPrimitiveValue::UnitTypePixels) = 15;
     expectation.at(CSSPrimitiveValue::UnitTypeFontSize) = 20;
     expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40;
     EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc((1 * 2) * (5px + 20em / 2) - 80% / (3 - 1) + 5px)")));
 }
 
 }