Revert of Stop passing raw pointers to base::Value API in c/b/ui

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/browser_options_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 148 matching lines @@
 using extensions::ExtensionRegistry;
 
 namespace {
 
 void AppendExtensionData(const std::string& key,
                          const Extension* extension,
                          base::DictionaryValue* dict) {
   std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue);
   details->SetString("id", extension ? extension->id() : std::string());
   details->SetString("name", extension ? extension->name() : std::string());
-  dict->Set(key, std::move(details));
+  dict->Set(key, details.release());
 }
 
 #if !defined(OS_CHROMEOS)
 bool IsDisabledByPolicy(const BooleanPrefMember& pref) {
   return pref.IsManaged() && !pref.GetValue();
 }
 #endif  // !defined(OS_CHROMEOS)
 
 std::string GetSyncErrorAction(sync_ui_util::ActionType action_type) {
   switch (action_type) {
@@ skipping 475 matching lines @@
         chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
     if (user && (user->GetType() != user_manager::USER_TYPE_GUEST))
       username = user->GetAccountId().GetUserEmail();
   }
   if (!username.empty())
     username = gaia::SanitizeEmail(gaia::CanonicalizeEmail(username));
 
   values->SetString("username", username);
 #endif
   // Pass along sync status early so it will be available during page init.
-  values->Set("syncData", GetSyncStateDictionary());
+  values->Set("syncData", GetSyncStateDictionary().release());
 
   values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
 
   values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
 
   values->SetBoolean(
       "metricsReportingEnabledAtStart",
       ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled());
 
 #if defined(OS_CHROMEOS)
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
-  values->Set("timezoneList", chromeos::system::GetTimezoneList());
+  values->Set("timezoneList", chromeos::system::GetTimezoneList().release());
 
   values->SetString("accessibilityLearnMoreURL",
                     chrome::kChromeAccessibilityHelpURL);
 
   std::string settings_url = std::string("chrome-extension://") +
       extension_misc::kChromeVoxExtensionId +
       chrome::kChromeAccessibilitySettingsURL;
 
   values->SetString("accessibilitySettingsURL",
                     settings_url);
 
   values->SetString("contentProtectionAttestationLearnMoreURL",
                     chrome::kAttestationForContentProtectionLearnMoreURL);
 
   // Creates magnifierList.
   std::unique_ptr<base::ListValue> magnifier_list(new base::ListValue);
 
   std::unique_ptr<base::ListValue> option_full(new base::ListValue);
   option_full->AppendInteger(ash::MAGNIFIER_FULL);
   option_full->AppendString(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));
   magnifier_list->Append(std::move(option_full));
 
   std::unique_ptr<base::ListValue> option_partial(new base::ListValue);
   option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
   option_partial->AppendString(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL));
   magnifier_list->Append(std::move(option_partial));
 
-  values->Set("magnifierList", std::move(magnifier_list));
+  values->Set("magnifierList", magnifier_list.release());
   values->SetBoolean("enablePolymerPreload", g_enable_polymer_preload);
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
   values->SetString("macPasswordsWarning",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
   values->SetBoolean("multiple_profiles",
       g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
 #endif
 
   if (ShouldShowMultiProfilesUserList())
-    values->Set("profilesInfo", GetProfilesInfoList());
+    values->Set("profilesInfo", GetProfilesInfoList().release());
 
   // Profile deletion is not allowed for any users in ChromeOS.
   bool allow_deletion = true;
 #if defined(OS_CHROMEOS)
   allow_deletion = allow_deletion && !ash::Shell::HasInstance();
 #endif
   values->SetBoolean("allowProfileDeletion", allow_deletion);
   values->SetBoolean("profileIsGuest", profile->IsOffTheRecord());
   values->SetBoolean("profileIsSupervised", profile->IsSupervised());
 
@@ skipping 1614 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options