Refactor HostContentSettingsMap::SetWebsiteSettingDefaultScope to take a std::unique_ptr.

chrome/browser/banners/app_banner_settings_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 268 matching lines @@
   base::DictionaryValue* app_dict =
       GetAppDict(origin_dict.get(), package_name_or_start_url);
   if (!app_dict)
     return;
 
   // Dates are stored in their raw form (i.e. not local dates) to be resilient
   // to time zone changes.
   std::string event_key(kBannerEventKeys[event]);
   app_dict->SetDouble(event_key, time.ToInternalValue());
 
-  settings->SetWebsiteSettingDefaultScope(origin_url, GURL(),
-                                          CONTENT_SETTINGS_TYPE_APP_BANNER,
-                                          std::string(), origin_dict.release());
+  settings->SetWebsiteSettingDefaultScope(
+      origin_url, GURL(), CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(),
+      std::move(origin_dict));
 
   // App banner content settings are lossy, meaning they will not cause the
   // prefs to become dirty. This is fine for most events, as if they are lost it
   // just means the user will have to engage a little bit more. However the
   // DID_ADD_TO_HOMESCREEN event should always be recorded to prevent
   // spamminess.
   if (event == APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN)
     settings->FlushLossyWebsiteSettings();
 }
 
@@ skipping 69 matching lines @@
     it = could_show_list->Erase(it, nullptr);
   }
 
   // Dates are stored in their raw form (i.e. not local dates) to be resilient
   // to time zone changes.
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetDouble(kBannerTimeKey, time.ToInternalValue());
   value->SetDouble(kBannerEngagementKey, engagement);
   could_show_list->Append(std::move(value));
 
-  settings->SetWebsiteSettingDefaultScope(origin_url, GURL(),
-                                          CONTENT_SETTINGS_TYPE_APP_BANNER,
-                                          std::string(), origin_dict.release());
+  settings->SetWebsiteSettingDefaultScope(
+      origin_url, GURL(), CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(),
+      std::move(origin_dict));
 }
 
 bool AppBannerSettingsHelper::ShouldShowBanner(
     content::WebContents* web_contents,
     const GURL& origin_url,
     const std::string& package_name_or_start_url,
     base::Time time) {
   // Ignore all checks if the flag to do so is set.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kBypassAppBannerEngagementChecks)) {
@@ skipping 217 matching lines @@
   // must only be active when there is one singular group under the banner
   // experiment, otherwise the banner and site engagement banner experiments
   // will conflict.
   //
   // Making the experiment active when a variations key is present allows us
   // to have experiments which enable multiple features under site engagement.
   std::string param = variations::GetVariationParamValue(
       SiteEngagementService::kEngagementParams, kBannerSiteEngagementParamsKey);
   return !param.empty();
 }