Replace DISALLOW_COPY_AND_ASSIGN macros in components/printing/

Replace the deprecated macros with explicit deletions.

Bug: 1010217
Change-Id: I1c37c7d97421ed530af9a37fd65983cc22bba0e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2365228
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799928}

components/printing/browser/print_composite_client.h

@@ -31,6 +31,8 @@ class PrintCompositeClient
       public content::WebContentsObserver {
  public:
   explicit PrintCompositeClient(content::WebContents* web_contents);
+  PrintCompositeClient(const PrintCompositeClient&) = delete;
+  PrintCompositeClient& operator=(const PrintCompositeClient&) = delete;
   ~PrintCompositeClient() override;
 
   // content::WebContentsObserver
@@ -174,8 +176,6 @@ class PrintCompositeClient
   base::WeakPtrFactory<PrintCompositeClient> weak_ptr_factory_{this};
 
   WEB_CONTENTS_USER_DATA_KEY_DECL();
-
-  DISALLOW_COPY_AND_ASSIGN(PrintCompositeClient);
 };
 
 }  // namespace printing

components/printing/browser/print_manager.h

@@ -8,7 +8,6 @@
 #include <map>
 #include <memory>
 
-#include "base/macros.h"
 #include "build/build_config.h"
 #include "components/printing/common/print.mojom.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -30,6 +29,8 @@ namespace printing {
 class PrintManager : public content::WebContentsObserver,
                      public mojom::PrintManagerHost {
  public:
+  PrintManager(const PrintManager&) = delete;
+  PrintManager& operator=(const PrintManager&) = delete;
   ~PrintManager() override;
 
 #if defined(OS_ANDROID)
@@ -121,8 +122,6 @@ class PrintManager : public content::WebContentsObserver,
 
   content::WebContentsFrameReceiverSet<printing::mojom::PrintManagerHost>
       print_manager_host_receivers_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrintManager);
 };
 
 }  // namespace printing

components/printing/renderer/print_render_frame_helper.cc

@@ -18,7 +18,6 @@
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/process/process_handle.h"
@@ -763,6 +762,9 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
                               blink::WebLocalFrame* frame,
                               const blink::WebNode& node,
                               bool ignore_css_margins);
+  PrepareFrameAndViewForPrint(const PrepareFrameAndViewForPrint&) = delete;
+  PrepareFrameAndViewForPrint& operator=(const PrepareFrameAndViewForPrint&) =
+      delete;
   ~PrepareFrameAndViewForPrint() override;
 
   // Optional. Replaces |frame_| with selection if needed. Will call |on_ready|
@@ -824,8 +826,6 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
   bool is_printing_started_ = false;
 
   base::WeakPtrFactory<PrepareFrameAndViewForPrint> weak_ptr_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(PrepareFrameAndViewForPrint);
 };
 
 PrepareFrameAndViewForPrint::PrepareFrameAndViewForPrint(

components/printing/renderer/print_render_frame_helper.h

@@ -10,7 +10,6 @@
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
-#include "base/macros.h"
 #include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ -74,6 +73,8 @@ class FrameReference {
  public:
   explicit FrameReference(blink::WebLocalFrame* frame);
   FrameReference();
+  FrameReference(const FrameReference&) = delete;
+  FrameReference& operator=(const FrameReference&) = delete;
   ~FrameReference();
 
   void Reset(blink::WebLocalFrame* frame);
@@ -84,8 +85,6 @@ class FrameReference {
  private:
   blink::WebView* view_;
   blink::WebLocalFrame* frame_;
-
-  DISALLOW_COPY_AND_ASSIGN(FrameReference);
 };
 
 // PrintRenderFrameHelper handles most of the printing grunt work for
@@ -122,6 +121,8 @@ class PrintRenderFrameHelper
 
   PrintRenderFrameHelper(content::RenderFrame* render_frame,
                          std::unique_ptr<Delegate> delegate);
+  PrintRenderFrameHelper(const PrintRenderFrameHelper&) = delete;
+  PrintRenderFrameHelper& operator=(const PrintRenderFrameHelper&) = delete;
   ~PrintRenderFrameHelper() override;
 
   // Minimum valid value for scaling. Since scaling is originally an integer
@@ -475,6 +476,8 @@ class PrintRenderFrameHelper
   class PrintPreviewContext {
    public:
     PrintPreviewContext();
+    PrintPreviewContext(const PrintPreviewContext&) = delete;
+    PrintPreviewContext& operator=(const PrintPreviewContext&) = delete;
     ~PrintPreviewContext();
 
     // Initializes the print preview context. Need to be called to set
@@ -619,13 +622,13 @@ class PrintRenderFrameHelper
     enum PrintPreviewErrorBuckets error_ = PREVIEW_ERROR_NONE;
 
     State state_ = UNINITIALIZED;
-
-    DISALLOW_COPY_AND_ASSIGN(PrintPreviewContext);
   };
 
   class ScriptingThrottler {
    public:
     ScriptingThrottler();
+    ScriptingThrottler(const ScriptingThrottler&) = delete;
+    ScriptingThrottler& operator=(const ScriptingThrottler&) = delete;
 
     // Returns false if script initiated printing occurs too often.
     bool IsAllowed(blink::WebLocalFrame* frame);
@@ -637,7 +640,6 @@ class PrintRenderFrameHelper
    private:
     base::Time last_print_;
     int count_ = 0;
-    DISALLOW_COPY_AND_ASSIGN(ScriptingThrottler);
   };
 
   ScriptingThrottler scripting_throttler_;
@@ -665,8 +667,6 @@ class PrintRenderFrameHelper
   mojo::AssociatedRemote<mojom::PrintManagerHost> print_manager_host_;
 
   base::WeakPtrFactory<PrintRenderFrameHelper> weak_ptr_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(PrintRenderFrameHelper);
 };
 
 }  // namespace printing

components/printing/test/mock_printer.h

@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "components/printing/common/print.mojom-forward.h"
@@ -31,6 +30,8 @@ class MockPrinterPage : public base::RefCounted<MockPrinterPage> {
   MockPrinterPage(const void* source_data,
                   uint32_t source_size,
                   const printing::Image& image);
+  MockPrinterPage(const MockPrinterPage&) = delete;
+  MockPrinterPage& operator=(const MockPrinterPage&) = delete;
 
   int width() const { return image_.size().width(); }
   int height() const { return image_.size().height(); }
@@ -45,8 +46,6 @@ class MockPrinterPage : public base::RefCounted<MockPrinterPage> {
   uint32_t source_size_;
   std::unique_ptr<uint8_t[]> source_data_;
   printing::Image image_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockPrinterPage);
 };
 
 // A class which implements a pseudo-printer object used by the RenderViewTest
@@ -66,6 +65,8 @@ class MockPrinter {
   };
 
   MockPrinter();
+  MockPrinter(const MockPrinter&) = delete;
+  MockPrinter& operator=(const MockPrinter&) = delete;
   ~MockPrinter();
 
   // Functions that changes settings of a pseudo printer.
@@ -158,8 +159,6 @@ class MockPrinter {
   bool use_invalid_settings_;
 
   std::vector<scoped_refptr<MockPrinterPage>> pages_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockPrinter);
 };
 
 #endif  // COMPONENTS_PRINTING_TEST_MOCK_PRINTER_H_

components/printing/test/print_mock_render_thread.h

@@ -13,7 +13,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "components/printing/common/print.mojom-forward.h"
@@ -33,6 +32,8 @@ struct PrintMsg_PrintPages_Params;
 class PrintMockRenderThread : public content::MockRenderThread {
  public:
   PrintMockRenderThread();
+  PrintMockRenderThread(const PrintMockRenderThread&) = delete;
+  PrintMockRenderThread& operator=(const PrintMockRenderThread&) = delete;
   ~PrintMockRenderThread() override;
 
   // content::RenderThread overrides.
@@ -110,8 +111,6 @@ class PrintMockRenderThread : public content::MockRenderThread {
 #endif
 
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrintMockRenderThread);
 };
 
 #endif  // COMPONENTS_PRINTING_TEST_PRINT_MOCK_RENDER_THREAD_H_

components/printing/test/print_render_frame_helper_browsertest.cc

@@ -11,7 +11,6 @@
 #include <utility>
 
 #include "base/command_line.h"
-#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
@@ -149,6 +148,8 @@ class DidPreviewPageListener : public IPC::Listener {
  public:
   explicit DidPreviewPageListener(base::RunLoop* run_loop)
       : run_loop_(run_loop) {}
+  DidPreviewPageListener(const DidPreviewPageListener&) = delete;
+  DidPreviewPageListener& operator=(const DidPreviewPageListener&) = delete;
 
   bool OnMessageReceived(const IPC::Message& message) override {
     if (message.type() == PrintHostMsg_MetafileReadyForPrinting::ID)
@@ -158,7 +159,6 @@ class DidPreviewPageListener : public IPC::Listener {
 
  private:
   base::RunLoop* const run_loop_;
-  DISALLOW_COPY_AND_ASSIGN(DidPreviewPageListener);
 };
 
 class FakePrintPreviewUI : public mojom::PrintPreviewUI {
@@ -258,6 +258,10 @@ class TestPrintManagerHost
 class PrintRenderFrameHelperTestBase : public content::RenderViewTest {
  public:
   PrintRenderFrameHelperTestBase() = default;
+  PrintRenderFrameHelperTestBase(const PrintRenderFrameHelperTestBase&) =
+      delete;
+  PrintRenderFrameHelperTestBase& operator=(
+      const PrintRenderFrameHelperTestBase&) = delete;
   ~PrintRenderFrameHelperTestBase() override = default;
 
  protected:
@@ -440,8 +444,6 @@ class PrintRenderFrameHelperTestBase : public content::RenderViewTest {
   // |content::RenderViewTest::render_thread_|.
   PrintMockRenderThread* print_render_thread_ = nullptr;
   std::unique_ptr<TestPrintManagerHost> print_manager_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(PrintRenderFrameHelperTestBase);
 };
 
 // RenderViewTest-based tests crash on Android
@@ -455,10 +457,11 @@ class PrintRenderFrameHelperTestBase : public content::RenderViewTest {
 class MAYBE_PrintRenderFrameHelperTest : public PrintRenderFrameHelperTestBase {
  public:
   MAYBE_PrintRenderFrameHelperTest() = default;
+  MAYBE_PrintRenderFrameHelperTest(const MAYBE_PrintRenderFrameHelperTest&) =
+      delete;
+  MAYBE_PrintRenderFrameHelperTest& operator=(
+      const MAYBE_PrintRenderFrameHelperTest&) = delete;
   ~MAYBE_PrintRenderFrameHelperTest() override = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MAYBE_PrintRenderFrameHelperTest);
 };
 
 // This tests only for platforms without print preview.
@@ -745,6 +748,10 @@ class MAYBE_PrintRenderFrameHelperPreviewTest
     : public PrintRenderFrameHelperTestBase {
  public:
   MAYBE_PrintRenderFrameHelperPreviewTest() = default;
+  MAYBE_PrintRenderFrameHelperPreviewTest(
+      const MAYBE_PrintRenderFrameHelperPreviewTest&) = delete;
+  MAYBE_PrintRenderFrameHelperPreviewTest& operator=(
+      const MAYBE_PrintRenderFrameHelperPreviewTest&) = delete;
   ~MAYBE_PrintRenderFrameHelperPreviewTest() override = default;
 
   void SetUp() override {
@@ -828,9 +835,6 @@ class MAYBE_PrintRenderFrameHelperPreviewTest
     EXPECT_EQ(expected_margin_bottom, std::get<0>(param).margin_bottom);
     EXPECT_EQ(expected_page_has_print_css, std::get<2>(param));
   }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MAYBE_PrintRenderFrameHelperPreviewTest);
 };
 
 TEST_F(MAYBE_PrintRenderFrameHelperPreviewTest, BlockScriptInitiatedPrinting) {