Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in core/xml/*

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

third_party/WebKit/Source/core/xml/DocumentXSLT.h

@@ -5,6 +5,7 @@
 #ifndef DocumentXSLT_h
 #define DocumentXSLT_h
 
+#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "core/dom/Document.h"
 #include "platform/heap/Handle.h"
@@ -16,7 +17,6 @@ class ProcessingInstruction;
 
 class DocumentXSLT final : public GarbageCollected<DocumentXSLT>,
                            public Supplement<Document> {
-  WTF_MAKE_NONCOPYABLE(DocumentXSLT);
   USING_GARBAGE_COLLECTED_MIXIN(DocumentXSLT);
 
  public:
@@ -49,6 +49,7 @@ class DocumentXSLT final : public GarbageCollected<DocumentXSLT>,
   explicit DocumentXSLT(Document&);
 
   Member<Document> transform_source_document_;
+  DISALLOW_COPY_AND_ASSIGN(DocumentXSLT);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/xml/XPathExpressionNode.h

@@ -27,6 +27,7 @@
 #ifndef XPathExpressionNode_h
 #define XPathExpressionNode_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/dom/Node.h"
 #include "core/xml/XPathValue.h"
@@ -59,8 +60,6 @@ class CORE_EXPORT ParseNode : public GarbageCollectedFinalized<ParseNode> {
 };
 
 class CORE_EXPORT Expression : public ParseNode {
-  WTF_MAKE_NONCOPYABLE(Expression);
-
  public:
   Expression();
   ~Expression() override;
@@ -106,6 +105,7 @@ class CORE_EXPORT Expression : public ParseNode {
   bool is_context_node_sensitive_;
   bool is_context_position_sensitive_;
   bool is_context_size_sensitive_;
+  DISALLOW_COPY_AND_ASSIGN(Expression);
 };
 
 }  // namespace XPath

third_party/WebKit/Source/core/xml/XPathParser.h

@@ -28,6 +28,7 @@
 #define XPathParser_h
 
 #include <memory>
+#include "base/macros.h"
 #include "core/xml/XPathPredicate.h"
 #include "core/xml/XPathStep.h"
 #include "platform/wtf/Allocator.h"
@@ -59,7 +60,6 @@ struct Token {
 };
 
 class Parser {
-  WTF_MAKE_NONCOPYABLE(Parser);
   STACK_ALLOCATED();
 
  public:
@@ -113,6 +113,7 @@ class Parser {
   Member<XPathNSResolver> resolver_;
 
   HashSet<std::unique_ptr<String>> strings_;
+  DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace XPath

third_party/WebKit/Source/core/xml/XPathPredicate.h

@@ -27,6 +27,7 @@
 #ifndef XPathPredicate_h
 #define XPathPredicate_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/xml/XPathExpressionNode.h"
 #include "core/xml/XPathValue.h"
@@ -117,8 +118,6 @@ class Union final : public Expression {
 };
 
 class Predicate final : public GarbageCollected<Predicate> {
-  WTF_MAKE_NONCOPYABLE(Predicate);
-
  public:
   explicit Predicate(Expression*);
   void Trace(blink::Visitor*);
@@ -134,6 +133,7 @@ class Predicate final : public GarbageCollected<Predicate> {
 
  private:
   Member<Expression> expr_;
+  DISALLOW_COPY_AND_ASSIGN(Predicate);
 };
 
 }  // namespace XPath

third_party/WebKit/Source/core/xml/XPathStep.h

@@ -27,6 +27,7 @@
 #ifndef XPathStep_h
 #define XPathStep_h
 
+#include "base/macros.h"
 #include "core/xml/XPathExpressionNode.h"
 #include "core/xml/XPathNodeSet.h"
 
@@ -39,8 +40,6 @@ namespace XPath {
 class Predicate;
 
 class Step final : public ParseNode {
-  WTF_MAKE_NONCOPYABLE(Step);
-
  public:
   enum Axis {
     kAncestorAxis,
@@ -132,6 +131,7 @@ class Step final : public ParseNode {
   Axis axis_;
   Member<NodeTest> node_test_;
   HeapVector<Member<Predicate>> predicates_;
+  DISALLOW_COPY_AND_ASSIGN(Step);
 };
 
 bool OptimizeStepPair(Step*, Step*);

third_party/WebKit/Source/core/xml/parser/XMLDocumentParserScope.h

@@ -27,8 +27,8 @@
 #define XMLDocumentParserScope_h
 
 #include <libxml/xmlerror.h>
+#include "base/macros.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -36,7 +36,6 @@ class Document;
 
 class XMLDocumentParserScope {
   STACK_ALLOCATED();
-  WTF_MAKE_NONCOPYABLE(XMLDocumentParserScope);
 
  public:
   explicit XMLDocumentParserScope(Document*);
@@ -54,6 +53,7 @@ class XMLDocumentParserScope {
   xmlGenericErrorFunc old_generic_error_func_;
   xmlStructuredErrorFunc old_structured_error_func_;
   void* old_error_context_;
+  DISALLOW_COPY_AND_ASSIGN(XMLDocumentParserScope);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/xml/parser/XMLParserScriptRunner.h

@@ -5,6 +5,7 @@
 #ifndef XMLParserScriptRunner_h
 #define XMLParserScriptRunner_h
 
+#include "base/macros.h"
 #include "core/dom/PendingScript.h"
 #include "platform/wtf/text/TextPosition.h"
 
@@ -20,7 +21,6 @@ class XMLParserScriptRunnerHost;
 class XMLParserScriptRunner final
     : public GarbageCollectedFinalized<XMLParserScriptRunner>,
       public PendingScriptClient {
-  WTF_MAKE_NONCOPYABLE(XMLParserScriptRunner);
   USING_GARBAGE_COLLECTED_MIXIN(XMLParserScriptRunner);
 
  public:
@@ -51,6 +51,7 @@ class XMLParserScriptRunner final
 
   // TODO(crbug/717643): Implement
   // https://html.spec.whatwg.org/#list-of-scripts-that-will-execute-when-the-document-has-finished-parsing
+  DISALLOW_COPY_AND_ASSIGN(XMLParserScriptRunner);
 };
 
 }  // namespace blink