[go: nahoru, domu]

Remove DISALLOW_* macros from chrome/

This inlines all remaining DISALLOW_* macros in chrome/. This is done
manually (vim regex + manually finding insertion position).

IWYU cleanup is left as a separate pass that is easier when these macros
go away.

Bug: 1010217
Change-Id: Idb18af9d32397a302fe0fcf51636160f744a572e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3192336
Commit-Queue: Peter Boström <pbos@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Owners-Override: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#926874}
diff --git a/chrome/browser/media/media_device_id_salt.h b/chrome/browser/media/media_device_id_salt.h
index 698f398..cea1b59 100644
--- a/chrome/browser/media/media_device_id_salt.h
+++ b/chrome/browser/media/media_device_id_salt.h
@@ -24,6 +24,9 @@
  public:
   explicit MediaDeviceIDSalt(PrefService* pref_service);
 
+  MediaDeviceIDSalt(const MediaDeviceIDSalt&) = delete;
+  MediaDeviceIDSalt& operator=(const MediaDeviceIDSalt&) = delete;
+
   std::string GetSalt() const;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ -34,8 +37,6 @@
   ~MediaDeviceIDSalt();
 
   mutable StringPrefMember media_device_id_salt_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaDeviceIDSalt);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_