Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in Source/core/frame.

This changes is for files in the path //t_p/WebKit/Source/core/frame/.

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: I8753284e767ccaceabdbd3a67c935c1bcde71a04
Reviewed-on: https://chromium-review.googlesource.com/806736Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521626}

third_party/WebKit/Source/core/frame/DOMTimerCoordinator.h

@@ -6,8 +6,9 @@
 #define DOMTimerCoordinator_h
 
 #include <memory>
+
+#include "base/macros.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/Time.h"
 
 namespace blink {
@@ -24,7 +25,6 @@ class WebTaskRunner;
 // which is used as a signal for throttling repetitive timers.
 class DOMTimerCoordinator {
   DISALLOW_NEW();
-  WTF_MAKE_NONCOPYABLE(DOMTimerCoordinator);
 
  public:
   explicit DOMTimerCoordinator(scoped_refptr<WebTaskRunner>);
@@ -67,6 +67,8 @@ class DOMTimerCoordinator {
   int circular_sequential_id_;
   int timer_nesting_level_;
   scoped_refptr<WebTaskRunner> timer_task_runner_;
+
+  DISALLOW_COPY_AND_ASSIGN(DOMTimerCoordinator);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/Deprecation.h

@@ -5,11 +5,11 @@
 #ifndef Deprecation_h
 #define Deprecation_h
 
+#include "base/macros.h"
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
 #include "core/frame/UseCounter.h"
 #include "platform/wtf/BitVector.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -18,7 +18,6 @@ enum class FeaturePolicyFeature;
 
 class CORE_EXPORT Deprecation {
   DISALLOW_NEW();
-  WTF_MAKE_NONCOPYABLE(Deprecation);
 
  public:
   Deprecation();
@@ -68,6 +67,8 @@ class CORE_EXPORT Deprecation {
 
   BitVector css_property_deprecation_bits_;
   unsigned mute_count_;
+
+  DISALLOW_COPY_AND_ASSIGN(Deprecation);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/FrameLifecycle.h

@@ -5,13 +5,11 @@
 #ifndef FrameLifecycle_h
 #define FrameLifecycle_h
 
-#include "platform/wtf/Noncopyable.h"
+#include "base/macros.h"
 
 namespace blink {
 
 class FrameLifecycle {
-  WTF_MAKE_NONCOPYABLE(FrameLifecycle);
-
  public:
   enum State {
     kAttached,
@@ -26,6 +24,8 @@ class FrameLifecycle {
 
  private:
   State state_;
+
+  DISALLOW_COPY_AND_ASSIGN(FrameLifecycle);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/FrameTestHelpers.h

@@ -35,6 +35,8 @@
 #include <gtest/gtest.h>
 #include <memory>
 #include <string>
+
+#include "base/macros.h"
 #include "core/exported/WebViewImpl.h"
 #include "core/frame/Settings.h"
 #include "platform/WebTaskRunner.h"
@@ -210,8 +212,6 @@ class TestWebViewClient : public WebViewClient {
 // Convenience class for handling the lifetime of a WebView and its associated
 // mainframe in tests.
 class WebViewHelper {
-  WTF_MAKE_NONCOPYABLE(WebViewHelper);
-
  public:
   WebViewHelper();
   ~WebViewHelper();
@@ -277,6 +277,8 @@ class WebViewHelper {
   // Non-null if the WebViewHelper owns the TestWebViewClient.
   std::unique_ptr<TestWebViewClient> owned_test_web_view_client_;
   TestWebViewClient* test_web_view_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewHelper);
 };
 
 // Minimal implementation of WebFrameClient needed for unit tests that load

third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.h

@@ -5,11 +5,11 @@
 #ifndef FrameViewAutoSizeInfo_h
 #define FrameViewAutoSizeInfo_h
 
+#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/Allocator.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -17,8 +17,6 @@ class LocalFrameView;
 
 class FrameViewAutoSizeInfo final
     : public GarbageCollected<FrameViewAutoSizeInfo> {
-  WTF_MAKE_NONCOPYABLE(FrameViewAutoSizeInfo);
-
  public:
   static FrameViewAutoSizeInfo* Create(LocalFrameView* frame_view) {
     return new FrameViewAutoSizeInfo(frame_view);
@@ -42,6 +40,8 @@ class FrameViewAutoSizeInfo final
   bool in_auto_size_;
   // True if autosize has been run since m_shouldAutoSize was set.
   bool did_run_autosize_;
+
+  DISALLOW_COPY_AND_ASSIGN(FrameViewAutoSizeInfo);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/Intervention.h

@@ -5,9 +5,9 @@
 #ifndef Intervention_h
 #define Intervention_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "platform/wtf/Allocator.h"
-#include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
@@ -16,15 +16,16 @@ class LocalFrame;
 
 class CORE_EXPORT Intervention {
   DISALLOW_NEW();
-  WTF_MAKE_NONCOPYABLE(Intervention);
 
  public:
-  Intervention() {}
-  ~Intervention() {}
+  Intervention() = default;
+  ~Intervention() = default;
 
   // Generates a intervention report, to be routed to the Reporting API and any
   // ReportingObservers. Also sends the intervention message to the console.
   static void GenerateReport(const LocalFrame*, const String& message);
+
+  DISALLOW_COPY_AND_ASSIGN(Intervention);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/LocalFrame.h

@@ -30,6 +30,8 @@
 #define LocalFrame_h
 
 #include <memory>
+
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/dom/UserGestureIndicator.h"
 #include "core/dom/WeakIdentifierMap.h"
@@ -421,7 +423,6 @@ DEFINE_TYPE_CASTS(LocalFrame,
 DECLARE_WEAK_IDENTIFIER_MAP(LocalFrame);
 
 class FrameNavigationDisabler {
-  WTF_MAKE_NONCOPYABLE(FrameNavigationDisabler);
   STACK_ALLOCATED();
 
  public:
@@ -430,6 +431,8 @@ class FrameNavigationDisabler {
 
  private:
   Member<LocalFrame> frame_;
+
+  DISALLOW_COPY_AND_ASSIGN(FrameNavigationDisabler);
 };
 
 // A helper class for attributing cost inside a scope to a LocalFrame, with
@@ -451,7 +454,6 @@ class FrameNavigationDisabler {
 // should be taken to ensure that it has an efficient fast path (for the common
 // case where we are not tracking this).
 class ScopedFrameBlamer {
-  WTF_MAKE_NONCOPYABLE(ScopedFrameBlamer);
   STACK_ALLOCATED();
 
  public:
@@ -465,6 +467,8 @@ class ScopedFrameBlamer {
   void LeaveContext();
 
   Member<LocalFrame> frame_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedFrameBlamer);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/OpenedFrameTracker.h

@@ -5,8 +5,8 @@
 #ifndef OpenedFrameTracker_h
 #define OpenedFrameTracker_h
 
+#include "base/macros.h"
 #include "platform/wtf/HashSet.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -16,8 +16,6 @@ class WebFrame;
 // Due to layering restrictions, we need to hide the implementation, since
 // public/web/ cannot depend on wtf/.
 class OpenedFrameTracker {
-  WTF_MAKE_NONCOPYABLE(OpenedFrameTracker);
-
  public:
   OpenedFrameTracker();
   ~OpenedFrameTracker();
@@ -35,6 +33,8 @@ class OpenedFrameTracker {
 
  private:
   WTF::HashSet<WebFrame*> opened_frames_;
+
+  DISALLOW_COPY_AND_ASSIGN(OpenedFrameTracker);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/PerformanceMonitor.h

@@ -5,6 +5,7 @@
 #ifndef PerformanceMonitor_h
 #define PerformanceMonitor_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
@@ -40,8 +41,6 @@ class SourceLocation;
 class CORE_EXPORT PerformanceMonitor final
     : public GarbageCollectedFinalized<PerformanceMonitor>,
       public scheduler::TaskTimeObserver {
-  WTF_MAKE_NONCOPYABLE(PerformanceMonitor);
-
  public:
   enum Violation : size_t {
     kLongTask,
@@ -164,6 +163,8 @@ class CORE_EXPORT PerformanceMonitor final
               WTF::UnsignedWithZeroKeyHashTraits<size_t>>
       subscriptions_;
   bool bypass_long_compile_threshold_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(PerformanceMonitor);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/ResizeViewportAnchor.h

@@ -5,6 +5,7 @@
 #ifndef ResizeViewportAnchor_h
 #define ResizeViewportAnchor_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/page/Page.h"
 #include "platform/heap/Handle.h"
@@ -22,8 +23,6 @@ class LocalFrameView;
 // position to be clamped).
 class CORE_EXPORT ResizeViewportAnchor final
     : public GarbageCollected<ResizeViewportAnchor> {
-  WTF_MAKE_NONCOPYABLE(ResizeViewportAnchor);
-
  public:
   ResizeViewportAnchor(Page& page) : page_(page), scope_count_(0) {}
 
@@ -55,6 +54,8 @@ class CORE_EXPORT ResizeViewportAnchor final
   ScrollOffset drift_;
   Member<Page> page_;
   int scope_count_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResizeViewportAnchor);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/Settings.h

@@ -29,6 +29,8 @@
 #define Settings_h
 
 #include <memory>
+
+#include "base/macros.h"
 #include "bindings/core/v8/V8CacheOptions.h"
 #include "core/CoreExport.h"
 #include "core/dom/events/AddEventListenerOptionsDefaults.h"
@@ -52,7 +54,6 @@
 namespace blink {
 
 class CORE_EXPORT Settings {
-  WTF_MAKE_NONCOPYABLE(Settings);
   USING_FAST_MALLOC(Settings);
 
  public:
@@ -95,6 +96,8 @@ class CORE_EXPORT Settings {
   bool text_autosizing_enabled_ : 1;
 
   SETTINGS_MEMBER_VARIABLES
+
+  DISALLOW_COPY_AND_ASSIGN(Settings);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/UseCounter.h

@@ -26,6 +26,7 @@
 #ifndef UseCounter_h
 #define UseCounter_h
 
+#include "base/macros.h"
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
 #include "core/css/parser/CSSParserMode.h"
@@ -34,7 +35,6 @@
 #include "platform/heap/HeapAllocator.h"
 #include "platform/wtf/BitVector.h"
 #include "platform/wtf/Forward.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -63,7 +63,6 @@ class StyleSheetContents;
 // Changes on UseCounter are observable by UseCounter::Observer.
 class CORE_EXPORT UseCounter {
   DISALLOW_NEW();
-  WTF_MAKE_NONCOPYABLE(UseCounter);
 
  public:
   enum Context {
@@ -175,6 +174,8 @@ class CORE_EXPORT UseCounter {
   BitVector animated_css_recorded_;
 
   HeapHashSet<Member<Observer>> observers_;
+
+  DISALLOW_COPY_AND_ASSIGN(UseCounter);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/WebLocalFrameImpl.cpp

@@ -92,6 +92,7 @@
 #include <set>
 #include <utility>
 
+#include "base/macros.h"
 #include "bindings/core/v8/BindingSecurity.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptController.h"
@@ -261,13 +262,11 @@ HeapVector<ScriptSourceCode> CreateSourcesVector(
 // Simple class to override some of PrintContext behavior. Some of the methods
 // made virtual so that they can be overridden by ChromePluginPrintContext.
 class ChromePrintContext : public PrintContext {
-  WTF_MAKE_NONCOPYABLE(ChromePrintContext);
-
  public:
   explicit ChromePrintContext(LocalFrame* frame)
       : PrintContext(frame), printed_page_width_(0) {}
 
-  ~ChromePrintContext() override {}
+  ~ChromePrintContext() override = default;
 
   virtual void BeginPrintMode(float width, float height) {
     DCHECK(!printed_page_width_);
@@ -416,6 +415,8 @@ class ChromePrintContext : public PrintContext {
   // Set when printing.
   float printed_page_width_;
   float printed_page_height_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromePrintContext);
 };
 
 // Simple class to override some of PrintContext behavior. This is used when

third_party/WebKit/Source/core/frame/WebViewFrameWidget.h

@@ -5,13 +5,13 @@
 #ifndef WebViewFrameWidget_h
 #define WebViewFrameWidget_h
 
+#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "core/CoreExport.h"
 #include "core/frame/WebFrameWidgetBase.h"
 #include "core/frame/WebLocalFrameImpl.h"
 #include "platform/heap/Handle.h"
 #include "platform/heap/SelfKeepAlive.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -34,8 +34,6 @@ class WebWidgetClient;
 // A more detailed writeup of this transition can be read at
 // https://goo.gl/7yVrnb.
 class CORE_EXPORT WebViewFrameWidget : public WebFrameWidgetBase {
-  WTF_MAKE_NONCOPYABLE(WebViewFrameWidget);
-
  public:
   explicit WebViewFrameWidget(WebWidgetClient&,
                               WebViewImpl&,
@@ -111,6 +109,8 @@ class CORE_EXPORT WebViewFrameWidget : public WebFrameWidgetBase {
   Member<WebLocalFrameImpl> main_frame_;
 
   SelfKeepAlive<WebViewFrameWidget> self_keep_alive_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewFrameWidget);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h

@@ -5,6 +5,7 @@
 #ifndef CSPDirectiveList_h
 #define CSPDirectiveList_h
 
+#include "base/macros.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/frame/csp/MediaListDirective.h"
 #include "core/frame/csp/SourceListDirective.h"
@@ -28,8 +29,6 @@ typedef HeapVector<Member<SourceListDirective>> SourceListDirectiveVector;
 
 class CORE_EXPORT CSPDirectiveList
     : public GarbageCollectedFinalized<CSPDirectiveList> {
-  WTF_MAKE_NONCOPYABLE(CSPDirectiveList);
-
  public:
   static CSPDirectiveList* Create(ContentSecurityPolicy*,
                                   const UChar* begin,
@@ -360,6 +359,8 @@ class CORE_EXPORT CSPDirectiveList
   bool use_reporting_api_;
 
   String eval_disabled_error_message_;
+
+  DISALLOW_COPY_AND_ASSIGN(CSPDirectiveList);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/csp/SourceListDirective.h

@@ -5,6 +5,7 @@
 #ifndef SourceListDirective_h
 #define SourceListDirective_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/frame/csp/CSPDirective.h"
 #include "core/frame/csp/CSPSource.h"
@@ -21,8 +22,6 @@ class ContentSecurityPolicy;
 class KURL;
 
 class CORE_EXPORT SourceListDirective final : public CSPDirective {
-  WTF_MAKE_NONCOPYABLE(SourceListDirective);
-
  public:
   SourceListDirective(const String& name,
                       const String& value,
@@ -137,6 +136,8 @@ class CORE_EXPORT SourceListDirective final : public CSPDirective {
   HashSet<String> nonces_;
   HashSet<CSPHashValue> hashes_;
   uint8_t hash_algorithms_used_;
+
+  DISALLOW_COPY_AND_ASSIGN(SourceListDirective);
 };
 
 }  // namespace blink