Store border-*-color on SurroundData in ComputedStyle not BorderColorAndStyle

third_party/WebKit/Source/core/style/BUILD.gn

 # 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.
 
 import("//third_party/WebKit/Source/core/core.gni")
 
 blink_core_sources("rendering") {
   visibility = [ "//third_party/WebKit/Source/core/*" ]
 
   sources = [
     "AppliedTextDecoration.cpp",
     "AppliedTextDecoration.h",
     "BasicShapes.cpp",
     "BasicShapes.h",
-    "BorderColorAndStyle.h",
     "BorderData.h",
     "BorderEdge.cpp",
     "BorderEdge.h",
     "BorderImageLength.h",
     "BorderImageLengthBox.h",
+    "BorderStyle.h",
     "BorderValue.h",
     "CachedUAStyle.h",
     "ClipPathOperation.cpp",
     "ClipPathOperation.h",
     "ComputedStyle.cpp",
     "ComputedStyle.h",
     "ComputedStyleConstants.h",
     "ContentData.cpp",
     "ContentData.h",
     "CounterContent.h",
@@ skipping 88 matching lines @@
     "SVGComputedStyle.cpp",
     "SVGComputedStyle.h",
     "SVGComputedStyleDefs.cpp",
     "SVGComputedStyleDefs.h",
   ]
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 }