Language detection: removing use of deprecated DISALLOW_COPY_AND_ASSIGN.

R=dmazzoni,akihiroota
CC=​thestig

Change-Id: I2d7f788c6147162406cb549cdeaebf16cdd3f914
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2096802
Commit-Queue: Chris Hall <chrishall@chromium.org>
Reviewed-by: Akihiro Ota <akihiroota@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751278}

ui/accessibility/ax_language_detection.h

@@ -115,6 +115,11 @@ class AX_EXPORT AXLanguageInfoStats {
   AXLanguageInfoStats();
   ~AXLanguageInfoStats();
 
+  // Each AXLanguageInfoStats is tied to a specific AXTree, copying is safe but
+  // logically doesn't make sense.
+  AXLanguageInfoStats(const AXLanguageInfoStats&) = delete;
+  AXLanguageInfoStats& operator=(const AXLanguageInfoStats&) = delete;
+
   // Adjust our statistics to add provided detected languages.
   void Add(const std::vector<std::string>& languages);
 
@@ -197,8 +202,6 @@ class AX_EXPORT AXLanguageInfoStats {
   // Set of top language detected for every node, used to generate the unique
   // number of detected languages metric (LangsPerPage).
   std::unordered_set<std::string> unique_top_lang_detected_;
-
-  DISALLOW_COPY_AND_ASSIGN(AXLanguageInfoStats);
 };
 
 // AXLanguageDetectionObserver is registered as a change observer on an AXTree
@@ -222,6 +225,11 @@ class AX_EXPORT AXLanguageDetectionObserver : public ui::AXTreeObserver {
   // Observer destructor will remove itself as an observer from the AXTree.
   ~AXLanguageDetectionObserver() override;
 
+  // AXLanguageDetectionObserver contains a pointer so copying is non-trivial.
+  AXLanguageDetectionObserver(const AXLanguageDetectionObserver&) = delete;
+  AXLanguageDetectionObserver& operator=(const AXLanguageDetectionObserver&) =
+      delete;
+
  private:
   void OnAtomicUpdateFinished(ui::AXTree* tree,
                               bool root_changed,
@@ -229,8 +237,6 @@ class AX_EXPORT AXLanguageDetectionObserver : public ui::AXTreeObserver {
 
   // Non-owning pointer to AXTree, used to de-register observer on destruction.
   AXTree* const tree_;
-
-  DISALLOW_COPY_AND_ASSIGN(AXLanguageDetectionObserver);
 };
 
 // AXLanguageDetectionManager manages all of the context needed for language
@@ -238,9 +244,14 @@ class AX_EXPORT AXLanguageDetectionObserver : public ui::AXTreeObserver {
 class AX_EXPORT AXLanguageDetectionManager {
  public:
   // Construct an AXLanguageDetectionManager for the specified tree.
-  AXLanguageDetectionManager(AXTree* tree);
+  explicit AXLanguageDetectionManager(AXTree* tree);
   ~AXLanguageDetectionManager();
 
+  // AXLanguageDetectionManager contains pointers so copying is non-trivial.
+  AXLanguageDetectionManager(const AXLanguageDetectionManager&) = delete;
+  AXLanguageDetectionManager& operator=(const AXLanguageDetectionManager&) =
+      delete;
+
   // Detect languages for each node in the tree managed by this manager.
   // This is the first pass in detection and labelling.
   // This only detects the language, it does not label it, for that see
@@ -296,8 +307,6 @@ class AX_EXPORT AXLanguageDetectionManager {
   AXTree* tree_;
 
   AXLanguageInfoStats lang_info_stats_;
-
-  DISALLOW_COPY_AND_ASSIGN(AXLanguageDetectionManager);
 };
 
 }  // namespace ui

ui/accessibility/ax_language_detection_unittest.cc

@@ -50,6 +50,11 @@ class AXLanguageDetectionTestFixture : public testing::Test {
   AXLanguageDetectionTestFixture() = default;
   ~AXLanguageDetectionTestFixture() override = default;
 
+  AXLanguageDetectionTestFixture(const AXLanguageDetectionTestFixture&) =
+      delete;
+  AXLanguageDetectionTestFixture& operator=(
+      const AXLanguageDetectionTestFixture&) = delete;
+
  protected:
   AXLanguageDetectionObserver* getObserver(AXTree& tree) {
     return tree.language_detection_manager->language_detection_observer_.get();
@@ -93,9 +98,6 @@ class AXLanguageDetectionTestFixture : public testing::Test {
     return tree.language_detection_manager->lang_info_stats_
         .unique_top_lang_detected_;
   }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AXLanguageDetectionTestFixture);
 };
 
 class AXLanguageDetectionTestStaticContent
@@ -104,6 +106,11 @@ class AXLanguageDetectionTestStaticContent
   AXLanguageDetectionTestStaticContent() = default;
   ~AXLanguageDetectionTestStaticContent() override = default;
 
+  AXLanguageDetectionTestStaticContent(
+      const AXLanguageDetectionTestStaticContent&) = delete;
+  AXLanguageDetectionTestStaticContent& operator=(
+      const AXLanguageDetectionTestStaticContent&) = delete;
+
   void SetUp() override {
     AXLanguageDetectionTestFixture::SetUp();
 
@@ -118,6 +125,11 @@ class AXLanguageDetectionTestDynamicContent
   AXLanguageDetectionTestDynamicContent() = default;
   ~AXLanguageDetectionTestDynamicContent() override = default;
 
+  AXLanguageDetectionTestDynamicContent(
+      const AXLanguageDetectionTestDynamicContent&) = delete;
+  AXLanguageDetectionTestDynamicContent& operator=(
+      const AXLanguageDetectionTestDynamicContent&) = delete;
+
   void SetUp() override {
     AXLanguageDetectionTestStaticContent::SetUp();