ImportantSites: Remove struct copy constructor

This change removes the copy constructor for ImportantDomainInfo to
prevent accidental copies of instances. The change also gets rid
calls to said constructor.

Bug: 1034140
Change-Id: Ib4fe05701df84922333c864f8c6094c95f8a192e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1967739
Commit-Queue: Jarryd Goodman <jarrydg@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726177}

chrome/browser/engagement/important_sites_usage_counter_unittest.cc

@@ -76,7 +76,7 @@ class ImportantSitesUsageCounterTest : public testing::Test {
   }
 
   void FetchCompleted(std::vector<ImportantDomainInfo> domain_info) {
-    domain_info_ = domain_info;
+    domain_info_ = std::move(domain_info);
     run_loop_->Quit();
   }
 
@@ -102,8 +102,8 @@ TEST_F(ImportantSitesUsageCounterTest, PopulateUsage) {
   i1.registerable_domain = "example.com";
   ImportantDomainInfo i2;
   i2.registerable_domain = "somethingelse.com";
-  important_sites.push_back(i1);
-  important_sites.push_back(i2);
+  important_sites.push_back(std::move(i1));
+  important_sites.push_back(std::move(i2));
 
   const std::vector<content::MockOriginData> origins = {
       {"http://example.com/", blink::mojom::StorageType::kTemporary, 1},
@@ -125,12 +125,12 @@ TEST_F(ImportantSitesUsageCounterTest, PopulateUsage) {
           ->GetDOMStorageContext();
 
   ImportantSitesUsageCounter::GetUsage(
-      important_sites, quota_manager, dom_storage_context,
+      std::move(important_sites), quota_manager, dom_storage_context,
       base::BindOnce(&ImportantSitesUsageCounterTest::FetchCompleted,
                      base::Unretained(this)));
   WaitForResult();
 
-  EXPECT_EQ(important_sites.size(), domain_info().size());
+  EXPECT_EQ(2U, domain_info().size());
   // The first important site is example.com. It uses 1B quota storage for
   // http://example.com/, 2B for https://example.com and 4B for
   // https://maps.example.com. On top of that it uses 16B local storage.

chrome/browser/engagement/important_sites_util.cc

@@ -407,7 +407,9 @@ void PopulateInfoMapWithInstalled(
 
 ImportantDomainInfo::ImportantDomainInfo() = default;
 ImportantDomainInfo::~ImportantDomainInfo() = default;
-ImportantDomainInfo::ImportantDomainInfo(const ImportantDomainInfo&) = default;
+ImportantDomainInfo::ImportantDomainInfo(ImportantDomainInfo&&) = default;
+ImportantDomainInfo& ImportantDomainInfo::operator=(ImportantDomainInfo&&) =
+    default;
 
 std::string ImportantSitesUtil::GetRegisterableDomainOrIP(const GURL& url) {
   return GetRegisterableDomainOrIPFromHost(url.host_piece());
@@ -461,7 +463,6 @@ ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
   std::vector<std::pair<std::string, ImportantDomainInfo>> items;
   for (auto& item : important_info)
     items.emplace_back(std::move(item));
-
   std::sort(items.begin(), items.end(), &CompareDescendingImportantInfo);
 
   std::vector<ImportantDomainInfo> final_list;
@@ -472,7 +473,7 @@ ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
         blacklisted_domains.end()) {
       continue;
     }
-    final_list.push_back(domain_info.second);
+    final_list.push_back(std::move(domain_info.second));
     RECORD_UMA_FOR_IMPORTANT_REASON(
         "Storage.ImportantSites.GeneratedReason",
         "Storage.ImportantSites.GeneratedReasonCount",
@@ -505,7 +506,7 @@ ImportantSitesUtil::GetInstalledRegisterableDomains(
       break;
     if (excluded_domains.find(domain_info.first) != excluded_domains.end())
       continue;
-    installed_domains.push_back(domain_info.second);
+    installed_domains.push_back(std::move(domain_info.second));
   }
   return installed_domains;
 }

chrome/browser/engagement/important_sites_util.h

@@ -33,7 +33,10 @@ class ImportantSitesUtil {
   struct ImportantDomainInfo {
     ImportantDomainInfo();
     ~ImportantDomainInfo();
-    ImportantDomainInfo(const ImportantDomainInfo&);
+    ImportantDomainInfo(ImportantDomainInfo&&);
+    ImportantDomainInfo(const ImportantDomainInfo&) = delete;
+    ImportantDomainInfo& operator=(ImportantDomainInfo&&);
+    ImportantDomainInfo& operator=(const ImportantDomainInfo&) = delete;
     std::string registerable_domain;
     GURL example_origin;
     double engagement_score = 0;

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

@@ -181,7 +181,8 @@ void ClearBrowsingDataHandler::GetRecentlyLaunchedInstalledApps(
 
 void ClearBrowsingDataHandler::OnGotInstalledApps(
     const std::string& webui_callback_id,
-    std::vector<ImportantSitesUtil::ImportantDomainInfo> installed_apps) {
+    const std::vector<ImportantSitesUtil::ImportantDomainInfo>&
+        installed_apps) {
   base::ListValue installed_apps_list;
   for (const auto& info : installed_apps) {
     auto entry = std::make_unique<base::DictionaryValue>();

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h

@@ -55,7 +55,8 @@ class ClearBrowsingDataHandler : public SettingsPageUIHandler,
   // Respond to the WebUI callback with the list of installed apps.
   void OnGotInstalledApps(
       const std::string& webui_callback_id,
-      std::vector<ImportantSitesUtil::ImportantDomainInfo> installed_apps);
+      const std::vector<ImportantSitesUtil::ImportantDomainInfo>&
+          installed_apps);
 
   // Build a filter of sites to include and exclude from site data removal
   // based on whether installed apps were marked for deletion by the checkbox on