[BrowserSwitcher] Clean up DISALLOW_COPY_AND_ASSIGN

Change-Id: I2a9f6b033b78d610fcae2f0c880613043a403db9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089991Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Auto-Submit: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748247}

chrome/browser/browser_switcher/browser_switcher_browsertest.cc

@@ -149,8 +149,6 @@ class BrowserSwitcherBrowserTest : public InProcessBrowserTest {
  private:
   base::ScopedTempDir temp_dir_;
   policy::MockConfigurationPolicyProvider provider_;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserSwitcherBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserSwitcherBrowserTest, RunsExternalCommand) {

chrome/browser/browser_switcher/browser_switcher_policy_migrator.h

@@ -17,10 +17,11 @@ class BrowserSwitcherPolicyMigrator
   BrowserSwitcherPolicyMigrator();
   ~BrowserSwitcherPolicyMigrator() override;
 
-  void Migrate(policy::PolicyBundle* bundle) override;
+  BrowserSwitcherPolicyMigrator(const BrowserSwitcherPolicyMigrator&) = delete;
+  BrowserSwitcherPolicyMigrator& operator=(
+      const BrowserSwitcherPolicyMigrator&) = delete;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(BrowserSwitcherPolicyMigrator);
+  void Migrate(policy::PolicyBundle* bundle) override;
 };
 
 }  // namespace browser_switcher

chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc

@@ -176,8 +176,6 @@ class BrowserSwitcherServiceTest : public InProcessBrowserTest {
 #if defined(OS_WIN)
   base::ScopedTempDir fake_appdata_dir_;
 #endif
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserSwitcherServiceTest);
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserSwitcherServiceTest, ExternalSitelistInvalidUrl) {

chrome/browser/browser_switcher/browser_switcher_service_factory.h

@@ -24,6 +24,10 @@ class BrowserSwitcherServiceFactory : public BrowserContextKeyedServiceFactory {
   static BrowserSwitcherService* GetForBrowserContext(
       content::BrowserContext* browser_context);
 
+  BrowserSwitcherServiceFactory(const BrowserSwitcherServiceFactory&) = delete;
+  BrowserSwitcherServiceFactory& operator=(
+      const BrowserSwitcherServiceFactory&) = delete;
+
  private:
   friend struct base::DefaultSingletonTraits<BrowserSwitcherServiceFactory>;
 
@@ -35,8 +39,6 @@ class BrowserSwitcherServiceFactory : public BrowserContextKeyedServiceFactory {
       content::BrowserContext* context) const override;
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserSwitcherServiceFactory);
 };
 
 }  // namespace browser_switcher

chrome/browser/browser_switcher/browser_switcher_sitelist.h

@@ -94,6 +94,10 @@ class BrowserSwitcherSitelistImpl : public BrowserSwitcherSitelist {
   explicit BrowserSwitcherSitelistImpl(const BrowserSwitcherPrefs* prefs);
   ~BrowserSwitcherSitelistImpl() override;
 
+  BrowserSwitcherSitelistImpl(const BrowserSwitcherSitelistImpl&) = delete;
+  BrowserSwitcherSitelistImpl& operator=(const BrowserSwitcherSitelistImpl&) =
+      delete;
+
   // BrowserSwitcherSitelist
   Decision GetDecision(const GURL& url) const override;
   void SetIeemSitelist(ParsedXml&& sitelist) override;
@@ -112,8 +116,6 @@ class BrowserSwitcherSitelistImpl : public BrowserSwitcherSitelist {
   RuleSet external_sitelist_;
 
   const BrowserSwitcherPrefs* const prefs_;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserSwitcherSitelistImpl);
 };
 
 }  // namespace browser_switcher

chrome/browser/browser_switcher/ieem_sitelist_parser.h

@@ -21,11 +21,11 @@ class ParsedXml {
             base::Optional<std::string>&& error);
   ~ParsedXml();
 
+  ParsedXml(const ParsedXml&) = delete;
+  ParsedXml& operator=(const ParsedXml&) = delete;
+
   std::vector<std::string> rules;
   base::Optional<std::string> error;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ParsedXml);
 };
 
 // Parses the XML contained in |xml|, and calls |callback| with the parsed XML

chrome/browser/browser_switcher/ieem_sitelist_parser_browsertest.cc

@@ -39,9 +39,6 @@ class IeemSitelistParserTest : public InProcessBrowserTest {
  public:
   IeemSitelistParserTest() = default;
   ~IeemSitelistParserTest() override = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(IeemSitelistParserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(IeemSitelistParserTest, BadXml) {