Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in Source/modules/accessibility.

This changes is for files in the path //t_p/WebKit/Source/modules/accessibility.

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.

Also take the chance to change ctor/dtor to use '= default' where possible.

This CL introduces no logic changes.

Bug: 565932
Change-Id: I5b03045c5e880d7a97aa9006e055ea4a065301c3
Reviewed-on: https://chromium-review.googlesource.com/822011Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523370}

third_party/WebKit/Source/modules/accessibility/AXARIAGrid.h

@@ -29,16 +29,14 @@
 #ifndef AXARIAGrid_h
 #define AXARIAGrid_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXTable.h"
-#include "platform/wtf/Forward.h"
 
 namespace blink {
 
 class AXObjectCacheImpl;
 
 class AXARIAGrid final : public AXTable {
-  WTF_MAKE_NONCOPYABLE(AXARIAGrid);
-
  private:
   AXARIAGrid(LayoutObject*, AXObjectCacheImpl&);
 
@@ -64,6 +62,8 @@ class AXARIAGrid final : public AXTable {
   unsigned CalculateNumColumns();
   void AddColumnChildren(unsigned num_cols);
   void AddHeaderContainerChild();
+
+  DISALLOW_COPY_AND_ASSIGN(AXARIAGrid);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXARIAGridCell.h

@@ -29,6 +29,7 @@
 #ifndef AXARIAGridCell_h
 #define AXARIAGridCell_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXTableCell.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXARIAGridCell final : public AXTableCell {
-  WTF_MAKE_NONCOPYABLE(AXARIAGridCell);
-
  private:
   AXARIAGridCell(LayoutObject*, AXObjectCacheImpl&);
 
@@ -61,6 +60,8 @@ class AXARIAGridCell final : public AXTableCell {
   bool IsAriaRowHeader() const;
   AXObject* ParentTable() const override;
   AXObject* ParentRow() const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXARIAGridCell);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXARIAGridRow.h

@@ -29,6 +29,7 @@
 #ifndef AXARIAGridRow_h
 #define AXARIAGridRow_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXTableRow.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXARIAGridRow final : public AXTableRow {
-  WTF_MAKE_NONCOPYABLE(AXARIAGridRow);
-
  private:
   AXARIAGridRow(LayoutObject*, AXObjectCacheImpl&);
   virtual void Trace(blink::Visitor*);
@@ -68,6 +67,8 @@ class AXARIAGridRow final : public AXTableRow {
   bool IsARIARow() const final;
   void ComputeCells(AXObjectVector from_child_list);
   bool AddCell(AXObject*);
+
+  DISALLOW_COPY_AND_ASSIGN(AXARIAGridRow);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXARIAGridRow, IsARIARow());

third_party/WebKit/Source/modules/accessibility/AXImageMapLink.h

@@ -29,6 +29,7 @@
 #ifndef AXImageMapLink_h
 #define AXImageMapLink_h
 
+#include "base/macros.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLMapElement.h"
 #include "modules/accessibility/AXNodeObject.h"
@@ -38,8 +39,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXImageMapLink final : public AXNodeObject {
-  WTF_MAKE_NONCOPYABLE(AXImageMapLink);
-
  private:
   explicit AXImageMapLink(HTMLAreaElement*, AXObjectCacheImpl&);
 
@@ -68,6 +67,8 @@ class AXImageMapLink final : public AXNodeObject {
 
  private:
   bool IsImageMapLink() const override { return true; }
+
+  DISALLOW_COPY_AND_ASSIGN(AXImageMapLink);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXImageMapLink, IsImageMapLink());

third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.h

@@ -29,6 +29,7 @@
 #ifndef AXInlineTextBox_h
 #define AXInlineTextBox_h
 
+#include "base/macros.h"
 #include "core/layout/line/AbstractInlineTextBox.h"
 #include "modules/accessibility/AXObject.h"
 
@@ -38,8 +39,6 @@ class Node;
 class AXObjectCacheImpl;
 
 class AXInlineTextBox final : public AXObject {
-  WTF_MAKE_NONCOPYABLE(AXInlineTextBox);
-
  private:
   AXInlineTextBox(scoped_refptr<AbstractInlineTextBox>, AXObjectCacheImpl&);
 
@@ -73,6 +72,8 @@ class AXInlineTextBox final : public AXObject {
   scoped_refptr<AbstractInlineTextBox> inline_text_box_;
 
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXInlineTextBox);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXLayoutObject.h

@@ -29,10 +29,10 @@
 #ifndef AXLayoutObject_h
 #define AXLayoutObject_h
 
+#include "base/macros.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXNodeObject.h"
 #include "platform/geometry/LayoutRect.h"
-#include "platform/wtf/Forward.h"
 
 namespace blink {
 
@@ -45,8 +45,6 @@ class LocalFrameView;
 class Node;
 
 class MODULES_EXPORT AXLayoutObject : public AXNodeObject {
-  WTF_MAKE_NONCOPYABLE(AXLayoutObject);
-
  protected:
   AXLayoutObject(LayoutObject*, AXObjectCacheImpl&);
 
@@ -212,6 +210,8 @@ class MODULES_EXPORT AXLayoutObject : public AXNodeObject {
   bool CanIgnoreTextAsEmpty() const;
   bool CanIgnoreSpaceNextTo(LayoutObject*, bool is_after) const;
   bool HasAriaCellRole(Element*) const;
+
+  DISALLOW_COPY_AND_ASSIGN(AXLayoutObject);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXLayoutObject, IsAXLayoutObject());

third_party/WebKit/Source/modules/accessibility/AXList.h

@@ -29,6 +29,7 @@
 #ifndef AXList_h
 #define AXList_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXList final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXList);
-
  private:
   AXList(LayoutObject*, AXObjectCacheImpl&);
 
@@ -52,6 +51,8 @@ class AXList final : public AXLayoutObject {
  private:
   bool IsDescriptionList() const;
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXList);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXListBox.h

@@ -29,6 +29,7 @@
 #ifndef AXListBox_h
 #define AXListBox_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXListBox final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXListBox);
-
  private:
   AXListBox(LayoutObject*, AXObjectCacheImpl&);
 
@@ -53,6 +52,8 @@ class AXListBox final : public AXLayoutObject {
 
  private:
   int active_index_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXListBox);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXListBox, IsAXListBox());

third_party/WebKit/Source/modules/accessibility/AXListBoxOption.h

@@ -29,9 +29,9 @@
 #ifndef AXListBoxOption_h
 #define AXListBoxOption_h
 
+#include "base/macros.h"
 #include "core/html/HTMLElement.h"
 #include "modules/accessibility/AXLayoutObject.h"
-#include "platform/wtf/Forward.h"
 
 namespace blink {
 
@@ -39,8 +39,6 @@ class AXObjectCacheImpl;
 class HTMLSelectElement;
 
 class AXListBoxOption final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXListBoxOption);
-
  private:
   AXListBoxOption(LayoutObject*, AXObjectCacheImpl&);
 
@@ -67,6 +65,8 @@ class AXListBoxOption final : public AXLayoutObject {
 
   HTMLSelectElement* ListBoxOptionParentNode() const;
   bool IsParentPresentationalRole() const;
+
+  DISALLOW_COPY_AND_ASSIGN(AXListBoxOption);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXMediaControls.h

@@ -29,6 +29,7 @@
 #ifndef AXMediaControls_h
 #define AXMediaControls_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXSlider.h"
 #include "modules/media_controls/elements/MediaControlElementType.h"
 
@@ -37,11 +38,9 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AccessibilityMediaControl : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AccessibilityMediaControl);
-
  public:
   static AXObject* Create(LayoutObject*, AXObjectCacheImpl&);
-  ~AccessibilityMediaControl() override {}
+  ~AccessibilityMediaControl() override = default;
 
   AccessibilityRole RoleValue() const override;
 
@@ -59,14 +58,14 @@ class AccessibilityMediaControl : public AXLayoutObject {
   AccessibilityMediaControl(LayoutObject*, AXObjectCacheImpl&);
   MediaControlElementType ControlType() const;
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AccessibilityMediaControl);
 };
 
 class AccessibilityMediaTimeline final : public AXSlider {
-  WTF_MAKE_NONCOPYABLE(AccessibilityMediaTimeline);
-
  public:
   static AXObject* Create(LayoutObject*, AXObjectCacheImpl&);
-  ~AccessibilityMediaTimeline() override {}
+  ~AccessibilityMediaTimeline() override = default;
 
   String Description(AXNameFrom,
                      AXDescriptionFrom&,
@@ -75,14 +74,14 @@ class AccessibilityMediaTimeline final : public AXSlider {
 
  private:
   AccessibilityMediaTimeline(LayoutObject*, AXObjectCacheImpl&);
+
+  DISALLOW_COPY_AND_ASSIGN(AccessibilityMediaTimeline);
 };
 
 class AXMediaControlsContainer final : public AccessibilityMediaControl {
-  WTF_MAKE_NONCOPYABLE(AXMediaControlsContainer);
-
  public:
   static AXObject* Create(LayoutObject*, AXObjectCacheImpl&);
-  ~AXMediaControlsContainer() override {}
+  ~AXMediaControlsContainer() override = default;
 
   AccessibilityRole RoleValue() const override { return kToolbarRole; }
 
@@ -99,14 +98,14 @@ class AXMediaControlsContainer final : public AccessibilityMediaControl {
  private:
   AXMediaControlsContainer(LayoutObject*, AXObjectCacheImpl&);
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXMediaControlsContainer);
 };
 
 class AccessibilityMediaTimeDisplay final : public AccessibilityMediaControl {
-  WTF_MAKE_NONCOPYABLE(AccessibilityMediaTimeDisplay);
-
  public:
   static AXObject* Create(LayoutObject*, AXObjectCacheImpl&);
-  ~AccessibilityMediaTimeDisplay() override {}
+  ~AccessibilityMediaTimeDisplay() override = default;
 
   AccessibilityRole RoleValue() const override { return kStaticTextRole; }
 
@@ -121,6 +120,8 @@ class AccessibilityMediaTimeDisplay final : public AccessibilityMediaControl {
  private:
   AccessibilityMediaTimeDisplay(LayoutObject*, AXObjectCacheImpl&);
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AccessibilityMediaTimeDisplay);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXMenuList.h

@@ -26,6 +26,7 @@
 #ifndef AXMenuList_h
 #define AXMenuList_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -34,8 +35,6 @@ class AXObjectCacheImpl;
 class LayoutMenuList;
 
 class AXMenuList final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXMenuList);
-
  public:
   static AXMenuList* Create(LayoutMenuList* layout_object, AXObjectCacheImpl&);
 
@@ -57,6 +56,8 @@ class AXMenuList final : public AXLayoutObject {
   AccessibilityRole DetermineAccessibilityRole() final;
 
   void AddChildren() override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXMenuList);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXMenuList, IsMenuList());

third_party/WebKit/Source/modules/accessibility/AXMenuListOption.h

@@ -26,6 +26,7 @@
 #ifndef AXMenuListOption_h
 #define AXMenuListOption_h
 
+#include "base/macros.h"
 #include "core/html/forms/HTMLOptionElement.h"
 #include "modules/accessibility/AXMockObject.h"
 
@@ -34,8 +35,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXMenuListOption final : public AXMockObject {
-  WTF_MAKE_NONCOPYABLE(AXMenuListOption);
-
  public:
   static AXMenuListOption* Create(HTMLOptionElement* element,
                                   AXObjectCacheImpl& ax_object_cache) {
@@ -77,6 +76,8 @@ class AXMenuListOption final : public AXMockObject {
   HTMLSelectElement* ParentSelectNode() const;
 
   Member<HTMLOptionElement> element_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXMenuListOption);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXMenuListOption, IsMenuListOption());

third_party/WebKit/Source/modules/accessibility/AXMenuListPopup.h

@@ -26,6 +26,7 @@
 #ifndef AXMenuListPopup_h
 #define AXMenuListPopup_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXMockObject.h"
 
 namespace blink {
@@ -35,8 +36,6 @@ class AXMenuListOption;
 class HTMLElement;
 
 class AXMenuListPopup final : public AXMockObject {
-  WTF_MAKE_NONCOPYABLE(AXMenuListPopup);
-
  public:
   static AXMenuListPopup* Create(AXObjectCacheImpl& ax_object_cache) {
     return new AXMenuListPopup(ax_object_cache);
@@ -68,6 +67,8 @@ class AXMenuListPopup final : public AXMockObject {
 
   // Note that this may be -1 if nothing is selected.
   int active_index_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXMenuListPopup);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXMenuListPopup, IsMenuListPopup());

third_party/WebKit/Source/modules/accessibility/AXMockObject.h

@@ -26,6 +26,7 @@
 #ifndef AXMockObject_h
 #define AXMockObject_h
 
+#include "base/macros.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXObject.h"
 
@@ -34,8 +35,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class MODULES_EXPORT AXMockObject : public AXObject {
-  WTF_MAKE_NONCOPYABLE(AXMockObject);
-
  protected:
   explicit AXMockObject(AXObjectCacheImpl&);
 
@@ -50,6 +49,8 @@ class MODULES_EXPORT AXMockObject : public AXObject {
   bool IsMockObject() const final { return true; }
 
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXMockObject);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXMockObject, IsMockObject());

third_party/WebKit/Source/modules/accessibility/AXNodeObject.h

@@ -29,9 +29,9 @@
 #ifndef AXNodeObject_h
 #define AXNodeObject_h
 
+#include "base/macros.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXObject.h"
-#include "platform/wtf/Forward.h"
 
 namespace blink {
 
@@ -41,8 +41,6 @@ class HTMLLabelElement;
 class Node;
 
 class MODULES_EXPORT AXNodeObject : public AXObject {
-  WTF_MAKE_NONCOPYABLE(AXNodeObject);
-
  protected:
   AXNodeObject(Node*, AXObjectCacheImpl&);
 
@@ -236,6 +234,8 @@ class MODULES_EXPORT AXNodeObject : public AXObject {
                                bool* found_text_alternative) const;
   bool IsDescendantOfElementType(HashSet<QualifiedName>& tag_names) const;
   String PlaceholderFromNativeAttribute() const;
+
+  DISALLOW_COPY_AND_ASSIGN(AXNodeObject);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXObject.h

@@ -32,6 +32,7 @@
 
 #include <ostream>
 
+#include "base/macros.h"
 #include "core/dom/Element.h"
 #include "core/editing/Forward.h"
 #include "core/editing/TextAffinity.h"
@@ -43,7 +44,6 @@
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/weborigin/KURL.h"
-#include "platform/wtf/Forward.h"
 #include "platform/wtf/Vector.h"
 
 class SkMatrix44;
@@ -149,8 +149,6 @@ class IgnoredReason {
 
 class NameSourceRelatedObject
     : public GarbageCollectedFinalized<NameSourceRelatedObject> {
-  WTF_MAKE_NONCOPYABLE(NameSourceRelatedObject);
-
  public:
   WeakMember<AXObject> object;
   String text;
@@ -159,6 +157,8 @@ class NameSourceRelatedObject
       : object(object), text(text) {}
 
   void Trace(blink::Visitor* visitor) { visitor->Trace(object); }
+
+  DISALLOW_COPY_AND_ASSIGN(NameSourceRelatedObject);
 };
 
 typedef HeapVector<Member<NameSourceRelatedObject>> AXRelatedObjectVector;
@@ -215,8 +215,6 @@ WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::DescriptionSource);
 namespace blink {
 
 class MODULES_EXPORT AXObject : public GarbageCollectedFinalized<AXObject> {
-  WTF_MAKE_NONCOPYABLE(AXObject);
-
  public:
   typedef HeapVector<Member<AXObject>> AXObjectVector;
 
@@ -900,6 +898,8 @@ class MODULES_EXPORT AXObject : public GarbageCollectedFinalized<AXObject> {
   AccessibilityRole RemapAriaRoleDueToParent(AccessibilityRole) const;
 
   static unsigned number_of_live_ax_objects_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXObject);
 };
 
 MODULES_EXPORT std::ostream& operator<<(std::ostream&, const AXObject&);

third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h

@@ -30,12 +30,13 @@
 #define AXObjectCacheImpl_h
 
 #include <memory>
+
+#include "base/macros.h"
 #include "core/dom/AXObjectCacheBase.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXObject.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "platform/wtf/Forward.h"
 #include "platform/wtf/HashMap.h"
 #include "platform/wtf/HashSet.h"
 #include "public/platform/modules/permissions/permission.mojom-blink.h"
@@ -52,8 +53,6 @@ class LocalFrameView;
 class MODULES_EXPORT AXObjectCacheImpl
     : public AXObjectCacheBase,
       public mojom::blink::PermissionObserver {
-  WTF_MAKE_NONCOPYABLE(AXObjectCacheImpl);
-
  public:
   static AXObjectCache* Create(Document&);
 
@@ -271,6 +270,8 @@ class MODULES_EXPORT AXObjectCacheImpl
   // permission.
   mojom::blink::PermissionServicePtr permission_service_;
   mojo::Binding<mojom::blink::PermissionObserver> permission_observer_binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXObjectCacheImpl);
 };
 
 // This is the only subclass of AXObjectCache.

third_party/WebKit/Source/modules/accessibility/AXProgressIndicator.h

@@ -21,6 +21,7 @@
 #ifndef AXProgressIndicator_h
 #define AXProgressIndicator_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -30,8 +31,6 @@ class HTMLProgressElement;
 class LayoutProgress;
 
 class AXProgressIndicator final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXProgressIndicator);
-
  public:
   static AXProgressIndicator* Create(LayoutProgress*, AXObjectCacheImpl&);
 
@@ -48,6 +47,8 @@ class AXProgressIndicator final : public AXLayoutObject {
 
   HTMLProgressElement* GetProgressElement() const;
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXProgressIndicator);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXRadioInput.h

@@ -5,6 +5,7 @@
 #ifndef AXRadioInput_h
 #define AXRadioInput_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -13,11 +14,9 @@ class AXObjectCacheImpl;
 class HTMLInputElement;
 
 class AXRadioInput final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXRadioInput);
-
  public:
   static AXRadioInput* Create(LayoutObject*, AXObjectCacheImpl&);
-  ~AXRadioInput() override {}
+  ~AXRadioInput() override = default;
 
   bool IsAXRadioInput() const override { return true; }
   void UpdatePosAndSetSize(int position = 0);
@@ -37,6 +36,8 @@ class AXRadioInput final : public AXLayoutObject {
 
   int pos_in_set_;
   int set_size_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXRadioInput);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXRadioInput, IsAXRadioInput());

third_party/WebKit/Source/modules/accessibility/AXRelationCache.h

@@ -29,6 +29,7 @@
 #ifndef AXRelationCache_h
 #define AXRelationCache_h
 
+#include "base/macros.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/wtf/HashMap.h"
@@ -38,8 +39,6 @@ namespace blink {
 
 // This class should only be used from inside the accessibility directory.
 class AXRelationCache {
-  WTF_MAKE_NONCOPYABLE(AXRelationCache);
-
  public:
   explicit AXRelationCache(AXObjectCacheImpl*);
   virtual ~AXRelationCache();
@@ -120,6 +119,8 @@ class AXRelationCache {
   void ChildrenChanged(AXObject*);
   void TextChanged(AXObject*);
   void LabelChanged(Node*);
+
+  DISALLOW_COPY_AND_ASSIGN(AXRelationCache);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXSVGRoot.h

@@ -29,6 +29,7 @@
 #ifndef AXSVGRoot_h
 #define AXSVGRoot_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXSVGRoot final : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXSVGRoot);
-
  protected:
   AXSVGRoot(LayoutObject*, AXObjectCacheImpl&);
 
@@ -53,6 +52,8 @@ class AXSVGRoot final : public AXLayoutObject {
  private:
   AXObject* ComputeParent() const override;
   bool IsAXSVGRoot() const override { return true; }
+
+  DISALLOW_COPY_AND_ASSIGN(AXSVGRoot);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXSlider.h

@@ -29,6 +29,7 @@
 #ifndef AXSlider_h
 #define AXSlider_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 #include "modules/accessibility/AXMockObject.h"
 
@@ -38,11 +39,9 @@ class AXObjectCacheImpl;
 class HTMLInputElement;
 
 class AXSlider : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXSlider);
-
  public:
   static AXSlider* Create(LayoutObject*, AXObjectCacheImpl&);
-  ~AXSlider() override {}
+  ~AXSlider() override = default;
 
  protected:
   AXSlider(LayoutObject*, AXObjectCacheImpl&);
@@ -59,14 +58,14 @@ class AXSlider : public AXLayoutObject {
 
   bool OnNativeSetValueAction(const String&) final;
   AccessibilityOrientation Orientation() const final;
+
+  DISALLOW_COPY_AND_ASSIGN(AXSlider);
 };
 
 class AXSliderThumb final : public AXMockObject {
-  WTF_MAKE_NONCOPYABLE(AXSliderThumb);
-
  public:
   static AXSliderThumb* Create(AXObjectCacheImpl&);
-  ~AXSliderThumb() override {}
+  ~AXSliderThumb() override = default;
 
   AccessibilityRole RoleValue() const override { return kSliderThumbRole; }
 
@@ -75,6 +74,8 @@ class AXSliderThumb final : public AXMockObject {
 
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
   LayoutObject* LayoutObjectForRelativeBounds() const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXSliderThumb);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXSpinButton.h

@@ -26,6 +26,7 @@
 #ifndef AXSpinButton_h
 #define AXSpinButton_h
 
+#include "base/macros.h"
 #include "core/html/forms/SpinButtonElement.h"
 #include "modules/accessibility/AXMockObject.h"
 
@@ -34,8 +35,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXSpinButton final : public AXMockObject {
-  WTF_MAKE_NONCOPYABLE(AXSpinButton);
-
  public:
   static AXSpinButton* Create(AXObjectCacheImpl&);
   ~AXSpinButton() override;
@@ -58,12 +57,14 @@ class AXSpinButton final : public AXMockObject {
   void DetachFromParent() override;
 
   Member<SpinButtonElement> spin_button_element_;
+
+  DISALLOW_COPY_AND_ASSIGN(AXSpinButton);
 };
 
 class AXSpinButtonPart final : public AXMockObject {
  public:
   static AXSpinButtonPart* Create(AXObjectCacheImpl&);
-  ~AXSpinButtonPart() override {}
+  ~AXSpinButtonPart() override = default;
   void SetIsIncrementor(bool value) { is_incrementor_ = value; }
 
  private:

third_party/WebKit/Source/modules/accessibility/AXTable.h

@@ -29,9 +29,9 @@
 #ifndef AXTable_h
 #define AXTable_h
 
+#include "base/macros.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXLayoutObject.h"
-#include "platform/wtf/Forward.h"
 
 namespace blink {
 
@@ -39,8 +39,6 @@ class AXObjectCacheImpl;
 class AXTableCell;
 
 class MODULES_EXPORT AXTable : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXTable);
-
  protected:
   AXTable(LayoutObject*, AXObjectCacheImpl&);
 
@@ -89,6 +87,8 @@ class MODULES_EXPORT AXTable : public AXLayoutObject {
   bool HasARIARole() const;
   virtual bool IsTableExposableThroughAccessibility() const;
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const final;
+
+  DISALLOW_COPY_AND_ASSIGN(AXTable);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXTable, IsAXTable());

third_party/WebKit/Source/modules/accessibility/AXTableCell.h

@@ -29,6 +29,7 @@
 #ifndef AXTableCell_h
 #define AXTableCell_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class MODULES_EXPORT AXTableCell : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXTableCell);
-
  protected:
   AXTableCell(LayoutObject*, AXObjectCacheImpl&);
 
@@ -75,6 +74,8 @@ class MODULES_EXPORT AXTableCell : public AXLayoutObject {
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const final;
 
   unsigned aria_col_index_from_row_ = 0;
+
+  DISALLOW_COPY_AND_ASSIGN(AXTableCell);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXTableCell, IsTableCell());

third_party/WebKit/Source/modules/accessibility/AXTableColumn.h

@@ -29,6 +29,7 @@
 #ifndef AXTableColumn_h
 #define AXTableColumn_h
 
+#include "base/macros.h"
 #include "modules/ModulesExport.h"
 #include "modules/accessibility/AXMockObject.h"
 #include "modules/accessibility/AXTable.h"
@@ -38,8 +39,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class MODULES_EXPORT AXTableColumn final : public AXMockObject {
-  WTF_MAKE_NONCOPYABLE(AXTableColumn);
-
  private:
   explicit AXTableColumn(AXObjectCacheImpl&);
 
@@ -66,6 +65,8 @@ class MODULES_EXPORT AXTableColumn final : public AXMockObject {
 
   bool IsTableCol() const override { return true; }
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXTableColumn);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXTableColumn, IsTableCol());

third_party/WebKit/Source/modules/accessibility/AXTableHeaderContainer.h

@@ -29,6 +29,7 @@
 #ifndef AXTableHeaderContainer_h
 #define AXTableHeaderContainer_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXMockObject.h"
 #include "modules/accessibility/AXTable.h"
 
@@ -37,8 +38,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class AXTableHeaderContainer final : public AXMockObject {
-  WTF_MAKE_NONCOPYABLE(AXTableHeaderContainer);
-
  private:
   explicit AXTableHeaderContainer(AXObjectCacheImpl&);
 
@@ -54,6 +53,8 @@ class AXTableHeaderContainer final : public AXMockObject {
 
  private:
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AXTableHeaderContainer);
 };
 
 }  // namespace blink

third_party/WebKit/Source/modules/accessibility/AXTableRow.h

@@ -29,6 +29,7 @@
 #ifndef AXTableRow_h
 #define AXTableRow_h
 
+#include "base/macros.h"
 #include "modules/accessibility/AXLayoutObject.h"
 
 namespace blink {
@@ -36,8 +37,6 @@ namespace blink {
 class AXObjectCacheImpl;
 
 class MODULES_EXPORT AXTableRow : public AXLayoutObject {
-  WTF_MAKE_NONCOPYABLE(AXTableRow);
-
  protected:
   AXTableRow(LayoutObject*, AXObjectCacheImpl&);
 
@@ -71,6 +70,8 @@ class MODULES_EXPORT AXTableRow : public AXLayoutObject {
   int row_index_;
 
   bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const final;
+
+  DISALLOW_COPY_AND_ASSIGN(AXTableRow);
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXTableRow, IsTableRow());