Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in core/style/*

This change is for files in the path
//third_party/WebKit/Source/core/style/.

Added the include for base/macros.h where needed and moved the macro to the
end of the class as per the code guidelines enforced by lint.

This CL introduces no logic changes.

Bug: 565932
Change-Id: I83e5103f69e36fbd39d227d6c5153cc14be8225c
Reviewed-on: https://chromium-review.googlesource.com/813136Reviewed-by: Sasha Morrissey <sashab@chromium.org>
Commit-Queue: Eve Martin-Jones <evem@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522363}

third_party/WebKit/Source/core/style/CachedUAStyle.h

@@ -23,13 +23,13 @@
 #ifndef CachedUAStyle_h
 #define CachedUAStyle_h
 
+#include "base/macros.h"
 #include "core/css/StyleColor.h"
 #include "core/style/FillLayer.h"
 #include "core/style/NinePieceImage.h"
 #include "platform/LengthSize.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/Allocator.h"
-#include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/PtrUtil.h"
 
 namespace blink {
@@ -42,7 +42,6 @@ class ComputedStyle;
 // ApplyMatchedProperties for later use during AdjustComputedStyle.
 class CachedUAStyle {
   USING_FAST_MALLOC(CachedUAStyle);
-  WTF_MAKE_NONCOPYABLE(CachedUAStyle);
   friend class ComputedStyle;
 
  public:
@@ -81,6 +80,7 @@ class CachedUAStyle {
 
  private:
   explicit CachedUAStyle(const ComputedStyle*);
+  DISALLOW_COPY_AND_ASSIGN(CachedUAStyle);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/style/FilterOperation.h

@@ -26,6 +26,7 @@
 #ifndef FilterOperation_h
 #define FilterOperation_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/style/ShadowData.h"
 #include "platform/Length.h"
@@ -33,7 +34,6 @@
 #include "platform/graphics/BoxReflection.h"
 #include "platform/graphics/Color.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
@@ -46,7 +46,6 @@ class SVGElementProxy;
 
 class CORE_EXPORT FilterOperation
     : public GarbageCollectedFinalized<FilterOperation> {
-  WTF_MAKE_NONCOPYABLE(FilterOperation);
 
  public:
   enum OperationType {
@@ -121,6 +120,7 @@ class CORE_EXPORT FilterOperation
  private:
   virtual FilterOperation* Blend(const FilterOperation* from,
                                  double progress) const = 0;
+  DISALLOW_COPY_AND_ASSIGN(FilterOperation);
 };
 
 #define DEFINE_FILTER_OPERATION_TYPE_CASTS(thisType, operationType)  \