diff --git a/third_party/WebKit/Source/core/core.gypi b/third_party/WebKit/Source/core/core.gypi
index df4a9d5a7e65b..490975976083e 100644
--- a/third_party/WebKit/Source/core/core.gypi
+++ b/third_party/WebKit/Source/core/core.gypi
@@ -3859,7 +3859,6 @@
             'css/CSSCalculationValueTest.cpp',
             'css/CSSFontFaceTest.cpp',
             'css/CSSSelectorTest.cpp',
-            'css/CSSStyleDeclarationTest.cpp',
             'css/CSSStyleSheetResourceTest.cpp',
             'css/CSSTestHelper.cpp',
             'css/CSSTestHelper.h',
diff --git a/third_party/WebKit/Source/core/css/CSSStyleDeclarationTest.cpp b/third_party/WebKit/Source/core/css/CSSStyleDeclarationTest.cpp
deleted file mode 100644
index 45d5bcd649e0f..0000000000000
--- a/third_party/WebKit/Source/core/css/CSSStyleDeclarationTest.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "core/css/CSSStyleDeclaration.h"
-
-#include "core/css/CSSRuleList.h"
-#include "core/css/CSSStyleRule.h"
-#include "core/css/CSSTestHelper.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace blink {
-
-TEST(CSSStyleDeclarationTest, getPropertyShorthand)
-{
-    CSSTestHelper helper;
-
-    helper.addCSSRules("div { padding: var(--p); }");
-    ASSERT_TRUE(helper.cssRules());
-    ASSERT_EQ(1u, helper.cssRules()->length());
-    ASSERT_EQ(CSSRule::STYLE_RULE, helper.cssRules()->item(0)->type());
-    CSSStyleRule* styleRule = toCSSStyleRule(helper.cssRules()->item(0));
-    CSSStyleDeclaration* style = styleRule->style();
-    ASSERT_TRUE(style);
-    EXPECT_EQ(AtomicString(), style->getPropertyShorthand("padding"));
-}
-
-} // namespace blink
diff --git a/third_party/WebKit/Source/core/css/CSSStyleRule.h b/third_party/WebKit/Source/core/css/CSSStyleRule.h
index b12ad31074172..b66281d913eb3 100644
--- a/third_party/WebKit/Source/core/css/CSSStyleRule.h
+++ b/third_party/WebKit/Source/core/css/CSSStyleRule.h
@@ -31,7 +31,7 @@ class CSSStyleDeclaration;
 class StyleRuleCSSStyleDeclaration;
 class StyleRule;
 
-class CORE_EXPORT CSSStyleRule final : public CSSRule {
+class CSSStyleRule final : public CSSRule {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtrWillBeRawPtr<CSSStyleRule> create(StyleRule* rule, CSSStyleSheet* sheet)
diff --git a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
index 8c444a705c6e1..4efa6e3e843a0 100644
--- a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
@@ -23,7 +23,6 @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
-#include "core/StylePropertyShorthand.h"
 #include "core/css/CSSCustomPropertyDeclaration.h"
 #include "core/css/CSSKeyframesRule.h"
 #include "core/css/CSSStyleSheet.h"
@@ -207,8 +206,6 @@ String AbstractPropertySetCSSStyleDeclaration::getPropertyShorthand(const String
     // Custom properties don't have shorthands, so we can ignore them here.
     if (!propertyID)
         return String();
-    if (isShorthandProperty(propertyID))
-        return String();
     CSSPropertyID shorthandID = propertySet().getPropertyShorthand(propertyID);
     if (!shorthandID)
         return String();