Remove raw base::DictionaryValue::SetWithoutPathExpansion

components/user_manager/user_manager_base.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 "components/user_manager/user_manager_base.h"
 
 #include <stddef.h>
 #include <set>
 #include <utility>
 
@@ skipping 356 matching lines @@
     user->set_oauth_token_status(oauth_token_status);
 
   // Do not update local state if data stored or cached outside the user's
   // cryptohome is to be treated as ephemeral.
   if (IsUserNonCryptohomeDataEphemeral(account_id))
     return;
 
   {
     DictionaryPrefUpdate oauth_status_update(GetLocalState(),
                                              kUserOAuthTokenStatus);
-    oauth_status_update->SetWithoutPathExpansion(
-        account_id.GetUserEmail(),
-        new base::Value(static_cast<int>(oauth_token_status)));
+    oauth_status_update->SetIntegerWithoutPathExpansion(
+        account_id.GetUserEmail(), static_cast<int>(oauth_token_status));
   }
   GetLocalState()->CommitPendingWrite();
 }
 
 void UserManagerBase::SaveForceOnlineSignin(const AccountId& account_id,
                                             bool force_online_signin) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   // Do not update local state if data stored or cached outside the user's
   // cryptohome is to be treated as ephemeral.
@@ skipping 14 matching lines @@
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   if (User* user = FindUserAndModify(account_id)) {
     user->set_display_name(display_name);
 
     // Do not update local state if data stored or cached outside the user's
     // cryptohome is to be treated as ephemeral.
     if (!IsUserNonCryptohomeDataEphemeral(account_id)) {
       DictionaryPrefUpdate display_name_update(GetLocalState(),
                                                kUserDisplayName);
-      display_name_update->SetWithoutPathExpansion(
-          account_id.GetUserEmail(), new base::Value(display_name));
+      display_name_update->SetStringWithoutPathExpansion(
+          account_id.GetUserEmail(), display_name);
     }
   }
 }
 
 base::string16 UserManagerBase::GetUserDisplayName(
     const AccountId& account_id) const {
   const User* user = FindUser(account_id);
   return user ? user->display_name() : base::string16();
 }
 
 void UserManagerBase::SaveUserDisplayEmail(const AccountId& account_id,
                                            const std::string& display_email) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   User* user = FindUserAndModify(account_id);
   if (!user) {
     LOG(ERROR) << "User not found: " << account_id.GetUserEmail();
     return;  // Ignore if there is no such user.
   }
 
   user->set_display_email(display_email);
 
   // Do not update local state if data stored or cached outside the user's
   // cryptohome is to be treated as ephemeral.
   if (IsUserNonCryptohomeDataEphemeral(account_id))
     return;
 
   DictionaryPrefUpdate display_email_update(GetLocalState(), kUserDisplayEmail);
-  display_email_update->SetWithoutPathExpansion(account_id.GetUserEmail(),
-                                                new base::Value(display_email));
+  display_email_update->SetStringWithoutPathExpansion(account_id.GetUserEmail(),
+                                                      display_email);
 }
 
 std::string UserManagerBase::GetUserDisplayEmail(
     const AccountId& account_id) const {
   const User* user = FindUser(account_id);
   return user ? user->display_email() : account_id.GetUserEmail();
 }
 
 void UserManagerBase::SaveUserType(const AccountId& account_id,
                                    const UserType& user_type) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   User* user = FindUserAndModify(account_id);
   if (!user) {
     LOG(ERROR) << "User not found: " << account_id.GetUserEmail();
     return;  // Ignore if there is no such user.
   }
 
   // Do not update local state if data stored or cached outside the user's
   // cryptohome is to be treated as ephemeral.
   if (IsUserNonCryptohomeDataEphemeral(account_id))
     return;
 
   DictionaryPrefUpdate user_type_update(GetLocalState(), kUserType);
-  user_type_update->SetWithoutPathExpansion(
-      account_id.GetUserEmail(), new base::Value(static_cast<int>(user_type)));
+  user_type_update->SetIntegerWithoutPathExpansion(account_id.GetUserEmail(),
+                                                   static_cast<int>(user_type));
   GetLocalState()->CommitPendingWrite();
 }
 
 void UserManagerBase::UpdateUserAccountData(
     const AccountId& account_id,
     const UserAccountData& account_data) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   SaveUserDisplayName(account_id, account_data.display_name());
 
   if (User* user = FindUserAndModify(account_id)) {
     base::string16 given_name = account_data.given_name();
     user->set_given_name(given_name);
     if (!IsUserNonCryptohomeDataEphemeral(account_id)) {
       DictionaryPrefUpdate given_name_update(GetLocalState(), kUserGivenName);
-      given_name_update->SetWithoutPathExpansion(account_id.GetUserEmail(),
-                                                 new base::Value(given_name));
+      given_name_update->SetStringWithoutPathExpansion(
+          account_id.GetUserEmail(), given_name);
     }
   }
 
   UpdateUserAccountLocale(account_id, account_data.locale());
 }
 
 void UserManagerBase::ParseUserList(const base::ListValue& users_list,
                                     const std::set<AccountId>& existing_users,
                                     std::vector<AccountId>* users_vector,
                                     std::set<AccountId>* users_set) {
@@ skipping 596 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = nullptr;
 }
 
 }  // namespace user_manager