Replace DISALLOW_COPY_AND_ASSIGN with =delete in script

Bug: 1010217
Change-Id: Iccba7f237dee5ea57a0ea77eedd1ac56a58f2fa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2344106
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796868}

AUTHORS

@@ -392,6 +392,7 @@ Hyungwook Lee <hyungwook.lee@navercorp.com>
 Hyungwook Lee <withlhw@gmail.com>
 HyunJi Kim <hjkim3323@gmail.com>
 Hyunjun Shin <hyunjun.shin2@navercorp.com>
+Hyunjun Shin <shjj1504@gmail.com>
 Hyunjune Kim <hyunjune.kim@samsung.com>
 Hyunki Baik <hyunki.baik@samsung.com>
 Ian Cullinan <cullinan@amazon.com>

third_party/blink/renderer/core/script/document_modulator_impl_test.cc

@@ -13,10 +13,12 @@
 namespace blink {
 
 class DocumentModulatorImplTest : public PageTestBase {
-  DISALLOW_COPY_AND_ASSIGN(DocumentModulatorImplTest);
 
  public:
   DocumentModulatorImplTest() = default;
+  DocumentModulatorImplTest(const DocumentModulatorImplTest&) = delete;
+  DocumentModulatorImplTest& operator=(const DocumentModulatorImplTest&) =
+      delete;
   void SetUp() override;
 
  protected:

third_party/blink/renderer/core/script/html_parser_script_runner.h

@@ -26,7 +26,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_HTML_PARSER_SCRIPT_RUNNER_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_HTML_PARSER_SCRIPT_RUNNER_H_
 
-#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "third_party/blink/renderer/core/html/parser/html_parser_reentry_permit.h"
 #include "third_party/blink/renderer/core/script/pending_script.h"
@@ -67,6 +66,8 @@ class HTMLParserScriptRunner final
   HTMLParserScriptRunner(HTMLParserReentryPermit*,
                          Document*,
                          HTMLParserScriptRunnerHost*);
+  HTMLParserScriptRunner(const HTMLParserScriptRunner&) = delete;
+  HTMLParserScriptRunner& operator=(const HTMLParserScriptRunner&) = delete;
   ~HTMLParserScriptRunner() override;
 
   // Invoked when the parser is detached.
@@ -161,8 +162,6 @@ class HTMLParserScriptRunner final
   // when |force_deferred_scripts_| is not empty in order to let the force
   // deferred scripts execute before any async scripts.
   bool suspended_async_script_execution_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(HTMLParserScriptRunner);
 };
 
 }  // namespace blink

third_party/blink/renderer/core/script/ignore_destructive_write_count_incrementer.h

@@ -26,7 +26,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_IGNORE_DESTRUCTIVE_WRITE_COUNT_INCREMENTER_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_IGNORE_DESTRUCTIVE_WRITE_COUNT_INCREMENTER_H_
 
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 
@@ -36,6 +35,10 @@ class IgnoreDestructiveWriteCountIncrementer {
   STACK_ALLOCATED();
 
  public:
+  IgnoreDestructiveWriteCountIncrementer(
+      const IgnoreDestructiveWriteCountIncrementer&) = delete;
+  IgnoreDestructiveWriteCountIncrementer& operator=(
+      const IgnoreDestructiveWriteCountIncrementer&) = delete;
   explicit IgnoreDestructiveWriteCountIncrementer(Document* document)
       : count_(document ? &document->ignore_destructive_write_count_
                         : nullptr) {
@@ -52,7 +55,6 @@ class IgnoreDestructiveWriteCountIncrementer {
 
  private:
   unsigned* count_;
-  DISALLOW_COPY_AND_ASSIGN(IgnoreDestructiveWriteCountIncrementer);
 };
 
 }  // namespace blink

third_party/blink/renderer/core/script/module_map.h

@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_MODULE_MAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_MODULE_MAP_H_
 
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/bindings/name_client.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
@@ -31,6 +30,8 @@ class CORE_EXPORT ModuleMap final : public GarbageCollected<ModuleMap>,
   class Entry;
 
  public:
+  ModuleMap(const ModuleMap&) = delete;
+  ModuleMap& operator=(const ModuleMap&) = delete;
   explicit ModuleMap(Modulator*);
 
   void Trace(Visitor*) const;
@@ -59,7 +60,6 @@ class CORE_EXPORT ModuleMap final : public GarbageCollected<ModuleMap>,
 
   Member<Modulator> modulator_;
   Member<ModuleScriptLoaderRegistry> loader_registry_;
-  DISALLOW_COPY_AND_ASSIGN(ModuleMap);
 };
 
 }  // namespace blink

third_party/blink/renderer/core/script/pending_import_map.h

@@ -45,6 +45,8 @@ class CORE_EXPORT PendingImportMap final
                    ImportMap*,
                    ScriptValue error_to_rethrow,
                    const ExecutionContext& original_context);
+  PendingImportMap(const PendingImportMap&) = delete;
+  PendingImportMap& operator=(const PendingImportMap&) = delete;
 
   void RegisterImportMap() const;
 
@@ -65,8 +67,6 @@ class CORE_EXPORT PendingImportMap final
   // This is only used to check whether the script element is moved between
   // context and thus doesn't retain a strong reference.
   WeakMember<const ExecutionContext> original_execution_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(PendingImportMap);
 };
 
 }  // namespace blink

third_party/blink/renderer/core/script/pending_script.h

@@ -26,7 +26,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_PENDING_SCRIPT_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_PENDING_SCRIPT_H_
 
-#include "base/macros.h"
 #include "third_party/blink/public/mojom/script/script_type.mojom-blink-forward.h"
 #include "third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h"
 #include "third_party/blink/renderer/core/core_export.h"
@@ -65,6 +64,8 @@ class CORE_EXPORT PendingScriptClient : public GarbageCollectedMixin {
 class CORE_EXPORT PendingScript : public GarbageCollected<PendingScript>,
                                   public NameClient {
  public:
+  PendingScript(const PendingScript&) = delete;
+  PendingScript& operator=(const PendingScript&) = delete;
   virtual ~PendingScript();
 
   TextPosition StartingPosition() const { return starting_position_; }
@@ -171,8 +172,6 @@ class CORE_EXPORT PendingScript : public GarbageCollected<PendingScript>,
   WeakMember<ExecutionContext> original_execution_context_;
 
   const bool created_during_document_write_;
-
-  DISALLOW_COPY_AND_ASSIGN(PendingScript);
 };
 
 }  // namespace blink

third_party/blink/renderer/core/script/script_runner.h

@@ -27,7 +27,6 @@
 #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_SCRIPT_RUNNER_H_
 
 #include "base/location.h"
-#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_state_observer.h"
@@ -48,6 +47,8 @@ class CORE_EXPORT ScriptRunner final
       public NameClient {
  public:
   explicit ScriptRunner(Document*);
+  ScriptRunner(const ScriptRunner&) = delete;
+  ScriptRunner& operator=(const ScriptRunner&) = delete;
 
   void QueueScriptForExecution(PendingScript*);
   bool HasPendingScripts() const {
@@ -122,8 +123,6 @@ class CORE_EXPORT ScriptRunner final
   // design doc:
   // https://docs.google.com/document/u/1/d/1G-IUrT4enARZlsIrFQ4d4cRVe9MRTJASfWwolV09JZE/edit.
   bool delay_async_script_milestone_reached_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(ScriptRunner);
 };
 
 }  // namespace blink

third_party/blink/renderer/core/script/xml_parser_script_runner.h

@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_XML_PARSER_SCRIPT_RUNNER_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_XML_PARSER_SCRIPT_RUNNER_H_
 
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/script/pending_script.h"
 #include "third_party/blink/renderer/platform/wtf/text/text_position.h"
 
@@ -23,6 +22,8 @@ class XMLParserScriptRunner final
       public PendingScriptClient {
  public:
   explicit XMLParserScriptRunner(XMLParserScriptRunnerHost*);
+  XMLParserScriptRunner(const XMLParserScriptRunner&) = delete;
+  XMLParserScriptRunner& operator=(const XMLParserScriptRunner&) = delete;
   ~XMLParserScriptRunner() override;
 
   bool HasParserBlockingScript() const { return parser_blocking_script_; }
@@ -45,7 +46,6 @@ class XMLParserScriptRunner final
 
   // TODO(crbug/717643): Implement
   // https://html.spec.whatwg.org/C/#list-of-scripts-that-will-execute-when-the-document-has-finished-parsing
-  DISALLOW_COPY_AND_ASSIGN(XMLParserScriptRunner);
 };
 
 }  // namespace blink