remove DISALLOW_COPY_AND_ASSIGN from browser/profiles/*

Bug: 1010217
Change-Id: Id243885fd52d5d62d96d415037d54ab7bd8d05d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372913Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801151}

chrome/browser/profiles/profile_manager.h

@@ -17,7 +17,6 @@
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
-#include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "build/build_config.h"
@@ -41,6 +40,8 @@ class ProfileManager : public content::NotificationObserver,
   using ProfileLoadedCallback = base::OnceCallback<void(Profile*)>;
 
   explicit ProfileManager(const base::FilePath& user_data_dir);
+  ProfileManager(const ProfileManager&) = delete;
+  ProfileManager& operator=(const ProfileManager&) = delete;
   ~ProfileManager() override;
 
 #if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -280,7 +281,8 @@ class ProfileManager : public content::NotificationObserver,
   // were loaded.
   struct ProfileInfo {
     ProfileInfo(std::unique_ptr<Profile> profile, bool created);
-
+    ProfileInfo(const ProfileInfo&) = delete;
+    ProfileInfo& operator=(const ProfileInfo&) = delete;
     ~ProfileInfo();
 
     std::unique_ptr<Profile> profile;
@@ -289,9 +291,6 @@ class ProfileManager : public content::NotificationObserver,
     // List of callbacks to run when profile initialization is done. Note, when
     // profile is fully loaded this vector will be empty.
     std::vector<CreateCallback> callbacks;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(ProfileInfo);
   };
 
   // Does final initial actions.
@@ -386,6 +385,8 @@ class ProfileManager : public content::NotificationObserver,
   class BrowserListObserver : public ::BrowserListObserver {
    public:
     explicit BrowserListObserver(ProfileManager* manager);
+    BrowserListObserver(const BrowserListObserver&) = delete;
+    BrowserListObserver& operator=(const BrowserListObserver&) = delete;
     ~BrowserListObserver() override;
 
     // ::BrowserListObserver implementation.
@@ -395,7 +396,6 @@ class ProfileManager : public content::NotificationObserver,
 
    private:
     ProfileManager* profile_manager_;
-    DISALLOW_COPY_AND_ASSIGN(BrowserListObserver);
   };
 
   // If the |loaded_profile| has been loaded successfully (according to
@@ -467,8 +467,6 @@ class ProfileManager : public content::NotificationObserver,
   // enough to do as part of the mass refactor CL which introduced
   // |thread_checker_|, ref. https://codereview.chromium.org/2907253003/#msg37.
   THREAD_CHECKER(thread_checker_);
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileManager);
 };
 
 // Same as the ProfileManager, but doesn't initialize some services of the
@@ -476,9 +474,9 @@ class ProfileManager : public content::NotificationObserver,
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileManagerWithoutInit);
+  ProfileManagerWithoutInit(const ProfileManagerWithoutInit&) = delete;
+  ProfileManagerWithoutInit& operator=(const ProfileManagerWithoutInit&) =
+      delete;
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_

chrome/browser/profiles/profile_manager_unittest.cc

@@ -142,6 +142,8 @@ class ProfileManagerTest : public testing::Test {
       : local_state_(TestingBrowserProcess::GetGlobal()) {
   }
 
+  ProfileManagerTest(const ProfileManagerTest&) = delete;
+  ProfileManagerTest& operator=(const ProfileManagerTest&) = delete;
   ~ProfileManagerTest() override = default;
 
   void SetUp() override {
@@ -253,9 +255,6 @@ class ProfileManagerTest : public testing::Test {
   std::unique_ptr<WallpaperControllerClient> wallpaper_controller_client_;
   TestWallpaperController test_wallpaper_controller_;
 #endif
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileManagerTest);
 };
 
 TEST_F(ProfileManagerTest, GetProfile) {
@@ -574,6 +573,8 @@ class UnittestGuestProfileManager : public UnittestProfileManager {
 class ProfileManagerGuestTest : public ProfileManagerTest  {
  public:
   ProfileManagerGuestTest() = default;
+  ProfileManagerGuestTest(const ProfileManagerGuestTest&) = delete;
+  ProfileManagerGuestTest& operator=(const ProfileManagerGuestTest&) = delete;
   ~ProfileManagerGuestTest() override = default;
 
   void SetUp() override {
@@ -601,9 +602,6 @@ class ProfileManagerGuestTest : public ProfileManagerTest  {
         user_manager::UserManager::Get());
   }
 #endif
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileManagerGuestTest);
 };
 
 TEST_F(ProfileManagerGuestTest, GetLastUsedProfileAllowedByPolicy) {

chrome/browser/profiles/profile_shortcut_manager.h

@@ -9,7 +9,6 @@
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/macros.h"
 #include "base/strings/string16.h"
 
 class ProfileManager;
@@ -20,6 +19,8 @@ class CommandLine;
 
 class ProfileShortcutManager {
  public:
+  ProfileShortcutManager(const ProfileShortcutManager&) = delete;
+  ProfileShortcutManager& operator=(const ProfileShortcutManager&) = delete;
   virtual ~ProfileShortcutManager();
 
   // Create a profile icon for the profile with path |profile_path|.
@@ -63,9 +64,6 @@ class ProfileShortcutManager {
 
  protected:
   ProfileShortcutManager();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileShortcutManager);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_

chrome/browser/profiles/profile_shortcut_manager_win.h

@@ -9,7 +9,6 @@
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/macros.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager_observer.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
@@ -41,6 +40,8 @@ base::string16 GetUniqueShortcutFilenameForProfile(
 class ShortcutFilenameMatcher {
  public:
   explicit ShortcutFilenameMatcher(const base::string16& profile_name);
+  ShortcutFilenameMatcher(const ShortcutFilenameMatcher&) = delete;
+  ShortcutFilenameMatcher& operator=(const ShortcutFilenameMatcher&) = delete;
 
   // Check that shortcut filename has a name given by us (by
   // GetShortcutFilenameForProfile or GetUniqueShortcutFilenameForProfile).
@@ -50,8 +51,6 @@ class ShortcutFilenameMatcher {
   const base::string16 profile_shortcut_filename_;
   const base::StringPiece16 lnk_ext_;
   base::StringPiece16 profile_shortcut_name_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShortcutFilenameMatcher);
 };
 
 // Returns the command-line flags to launch Chrome with the given profile.
@@ -82,6 +81,9 @@ class ProfileShortcutManagerWin : public ProfileShortcutManager,
   };
 
   explicit ProfileShortcutManagerWin(ProfileManager* manager);
+  ProfileShortcutManagerWin(const ProfileShortcutManagerWin&) = delete;
+  ProfileShortcutManagerWin& operator=(const ProfileShortcutManagerWin&) =
+      delete;
   ~ProfileShortcutManagerWin() override;
 
   // ProfileShortcutManager implementation:
@@ -123,8 +125,6 @@ class ProfileShortcutManagerWin : public ProfileShortcutManager,
       bool incognito);
 
   ProfileManager* profile_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileShortcutManagerWin);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_

chrome/browser/profiles/profile_statistics_aggregator.h

@@ -25,7 +25,9 @@ class ProfileStatisticsAggregator {
  public:
   ProfileStatisticsAggregator(Profile* profile,
                               const base::Closure& done_callback);
-
+  ProfileStatisticsAggregator(const ProfileStatisticsAggregator&) = delete;
+  ProfileStatisticsAggregator& operator=(const ProfileStatisticsAggregator&) =
+      delete;
   ~ProfileStatisticsAggregator();
 
   void AddCallbackAndStartAggregator(
@@ -59,8 +61,6 @@ class ProfileStatisticsAggregator {
   base::Closure done_callback_;
 
   std::vector<std::unique_ptr<browsing_data::BrowsingDataCounter>> counters_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileStatisticsAggregator);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_STATISTICS_AGGREGATOR_H_

chrome/browser/profiles/profile_statistics_factory.h

@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_STATISTICS_FACTORY_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_STATISTICS_FACTORY_H_
 
-#include "base/macros.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
 namespace base {
@@ -18,6 +17,8 @@ class ProfileStatistics;
 // Singleton that owns all ProfileStatistics and associates them with Profiles.
 class ProfileStatisticsFactory : public BrowserContextKeyedServiceFactory {
  public:
+  ProfileStatisticsFactory(const ProfileStatisticsFactory&) = delete;
+  ProfileStatisticsFactory& operator=(const ProfileStatisticsFactory&) = delete;
   static ProfileStatistics* GetForProfile(Profile* profile);
 
   static ProfileStatisticsFactory* GetInstance();
@@ -30,8 +31,6 @@ class ProfileStatisticsFactory : public BrowserContextKeyedServiceFactory {
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileStatisticsFactory);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_STATISTICS_FACTORY_H_

chrome/browser/profiles/profile_window.h

@@ -136,6 +136,10 @@ class BrowserAddedForProfileObserver : public BrowserListObserver {
  public:
   BrowserAddedForProfileObserver(Profile* profile,
                                  ProfileManager::CreateCallback callback);
+  BrowserAddedForProfileObserver(const BrowserAddedForProfileObserver&) =
+      delete;
+  BrowserAddedForProfileObserver& operator=(
+      const BrowserAddedForProfileObserver&) = delete;
   ~BrowserAddedForProfileObserver() override;
 
  private:
@@ -145,8 +149,6 @@ class BrowserAddedForProfileObserver : public BrowserListObserver {
   // Profile for which the browser should be opened.
   Profile* profile_;
   ProfileManager::CreateCallback callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserAddedForProfileObserver);
 };
 
 }  // namespace profiles

chrome/browser/profiles/profile_window_browsertest.cc

@@ -9,7 +9,6 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ -61,7 +60,9 @@ namespace {
 // Notifies the main thread after all history backend thread tasks have run.
 class WaitForHistoryTask : public history::HistoryDBTask {
  public:
-  WaitForHistoryTask() {}
+  WaitForHistoryTask() = default;
+  WaitForHistoryTask(const WaitForHistoryTask&) = delete;
+  WaitForHistoryTask& operator=(const WaitForHistoryTask&) = delete;
 
   bool RunOnDBThread(history::HistoryBackend* backend,
                      history::HistoryDatabase* db) override {
@@ -73,9 +74,7 @@ class WaitForHistoryTask : public history::HistoryDBTask {
   }
 
  private:
-  ~WaitForHistoryTask() override {}
-
-  DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask);
+  ~WaitForHistoryTask() override = default;
 };
 
 void WaitForHistoryBackendToRun(Profile* profile) {
@@ -116,13 +115,12 @@ base::FilePath CreateTestingProfile(const std::string& name,
 
 class ProfileWindowBrowserTest : public InProcessBrowserTest {
  public:
-  ProfileWindowBrowserTest() {}
-  ~ProfileWindowBrowserTest() override {}
+  ProfileWindowBrowserTest() = default;
+  ProfileWindowBrowserTest(const ProfileWindowBrowserTest&) = delete;
+  ProfileWindowBrowserTest& operator=(const ProfileWindowBrowserTest&) = delete;
+  ~ProfileWindowBrowserTest() override = default;
 
   Browser* OpenGuestBrowser();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileWindowBrowserTest);
 };
 
 Browser* ProfileWindowBrowserTest::OpenGuestBrowser() {

chrome/browser/profiles/renderer_updater.h

@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "chrome/common/renderer_configuration.mojom-forward.h"
 #include "components/keyed_service/core/keyed_service.h"
@@ -36,6 +35,8 @@ class RendererUpdater : public KeyedService,
                         public signin::IdentityManager::Observer {
  public:
   explicit RendererUpdater(Profile* profile);
+  RendererUpdater(const RendererUpdater&) = delete;
+  RendererUpdater& operator=(const RendererUpdater&) = delete;
   ~RendererUpdater() override;
 
   // KeyedService:
@@ -87,8 +88,6 @@ class RendererUpdater : public KeyedService,
   ScopedObserver<signin::IdentityManager, signin::IdentityManager::Observer>
       identity_manager_observer_;
   signin::IdentityManager* identity_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(RendererUpdater);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_RENDERER_UPDATER_H_

chrome/browser/profiles/renderer_updater_factory.h

@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_PROFILES_RENDERER_UPDATER_FACTORY_H_
 #define CHROME_BROWSER_PROFILES_RENDERER_UPDATER_FACTORY_H_
 
-#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
@@ -22,6 +21,9 @@ class RendererUpdaterFactory : public BrowserContextKeyedServiceFactory {
   // Returns the instance of RendererUpdater for the passed |profile|.
   static RendererUpdater* GetForProfile(Profile* profile);
 
+  RendererUpdaterFactory(const RendererUpdaterFactory&) = delete;
+  RendererUpdaterFactory& operator=(const RendererUpdaterFactory&) = delete;
+
  protected:
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
@@ -33,8 +35,6 @@ class RendererUpdaterFactory : public BrowserContextKeyedServiceFactory {
 
   RendererUpdaterFactory();
   ~RendererUpdaterFactory() override;
-
-  DISALLOW_COPY_AND_ASSIGN(RendererUpdaterFactory);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_RENDERER_UPDATER_FACTORY_H_