Remove raw DictionaryValue::Set in //components

components/sync/driver/about_sync_util.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 "components/sync/driver/about_sync_util.h"
 
 #include <string>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 59 matching lines @@
 const char kTypes[] = "types";
 const char kUpdate[] = "update";
 
 namespace {
 
 // Creates a 'section' for display on about:sync, consisting of a title and a
 // list of fields.  Returns a pointer to the new section.  Note that
 // |parent_list|, not the caller, owns the newly added section.
 base::ListValue* AddSection(base::ListValue* parent_list,
                             const std::string& title) {
-  std::unique_ptr<base::DictionaryValue> section(new base::DictionaryValue());
-  base::ListValue* section_contents = new base::ListValue();
+  auto section = base::MakeUnique<base::DictionaryValue>();
   section->SetString("title", title);
-  section->Set("data", section_contents);
+  base::ListValue* section_contents =
+      section->SetList("data", base::MakeUnique<base::ListValue>());
   section->SetBoolean("is_sensitive", false);
   // If the following |Append| results in a reallocation, pointers to the
   // members of |parent_list| will be invalidated. This would result in
   // use-after-free in |*SyncStat::SetValue|. This is why the following CHECK is
   // necessary to ensure no reallocation takes place.
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   CHECK_LT(parent_list->GetSize(), parent_list->capacity());
   parent_list->Append(std::move(section));
   return section_contents;
 }
 
 // Same as AddSection, but for data that should be elided when dumped into text
 // form and posted in a public forum (e.g. unique identifiers).
 base::ListValue* AddSensitiveSection(base::ListValue* parent_list,
                                      const std::string& title) {
-  std::unique_ptr<base::DictionaryValue> section(new base::DictionaryValue());
-  base::ListValue* section_contents = new base::ListValue();
+  auto section = base::MakeUnique<base::DictionaryValue>();
   section->SetString("title", title);
-  section->Set("data", section_contents);
+  base::ListValue* section_contents =
+      section->SetList("data", base::MakeUnique<base::ListValue>());
   section->SetBoolean("is_sensitive", true);
   // If the following |Append| results in a reallocation, pointers to
   // |parent_list| and its members will be invalidated. This would result in
   // use-after-free in |*SyncStat::SetValue|. This is why the following CHECK is
   // necessary to ensure no reallocation takes place.
   CHECK_LT(parent_list->GetSize(), parent_list->capacity());
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   parent_list->Append(std::move(section));
   return section_contents;
 }
@@ skipping 164 matching lines @@
 
 }  // namespace
 
 // This function both defines the structure of the message to be returned and
 // its contents.  Most of the message consists of simple fields in about:sync
 // which are grouped into sections and populated with the help of the SyncStat
 // classes defined above.
 std::unique_ptr<base::DictionaryValue> ConstructAboutInformation(
     SyncService* service,
     version_info::Channel channel) {
-  std::unique_ptr<base::DictionaryValue> about_info(
-      new base::DictionaryValue());
+  auto about_info = base::MakeUnique<base::DictionaryValue>();
 
   // 'details': A list of sections.
-  base::ListValue* stats_list = new base::ListValue();
+  auto stats_list = base::MakeUnique<base::ListValue>();
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   stats_list->Reserve(12);
 
   // The following lines define the sections and their fields.  For each field,
   // a class is instantiated, which allows us to reference the fields in
   // 'setter' code later on in this function.
-  base::ListValue* section_summary = AddSection(stats_list, "Summary");
+  base::ListValue* section_summary = AddSection(stats_list.get(), "Summary");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_summary->Reserve(1);
   StringSyncStat summary_string(section_summary, "Summary");
 
-  base::ListValue* section_version = AddSection(stats_list, "Version Info");
+  base::ListValue* section_version =
+      AddSection(stats_list.get(), "Version Info");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_version->Reserve(2);
   StringSyncStat client_version(section_version, "Client Version");
   StringSyncStat server_url(section_version, "Server URL");
 
   base::ListValue* section_identity =
-      AddSensitiveSection(stats_list, kIdentityTitle);
+      AddSensitiveSection(stats_list.get(), kIdentityTitle);
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_identity->Reserve(3);
   StringSyncStat sync_id(section_identity, "Sync Client ID");
   StringSyncStat invalidator_id(section_identity, "Invalidator Client ID");
   StringSyncStat username(section_identity, "Username");
 
-  base::ListValue* section_credentials = AddSection(stats_list, "Credentials");
+  base::ListValue* section_credentials =
+      AddSection(stats_list.get(), "Credentials");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_credentials->Reserve(4);
   StringSyncStat request_token_time(section_credentials, "Requested Token");
   StringSyncStat receive_token_time(section_credentials, "Received Token");
   StringSyncStat token_request_status(section_credentials,
                                       "Token Request Status");
   StringSyncStat next_token_request(section_credentials, "Next Token Request");
 
-  base::ListValue* section_local = AddSection(stats_list, "Local State");
+  base::ListValue* section_local = AddSection(stats_list.get(), "Local State");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_local->Reserve(7);
   StringSyncStat server_connection(section_local, "Server Connection");
   StringSyncStat last_synced(section_local, "Last Synced");
   BoolSyncStat is_setup_complete(section_local,
                                  "Sync First-Time Setup Complete");
   StringSyncStat backend_initialization(section_local,
                                         "Sync Backend Initialization");
   BoolSyncStat is_syncing(section_local, "Syncing");
   BoolSyncStat is_local_sync_enabled(section_local,
                                      "Local sync backend enabled");
   StringSyncStat local_backend_path(section_local, "Local backend path");
 
-  base::ListValue* section_network = AddSection(stats_list, "Network");
+  base::ListValue* section_network = AddSection(stats_list.get(), "Network");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_network->Reserve(3);
   BoolSyncStat is_throttled(section_network, "Throttled");
   StringSyncStat retry_time(section_network, "Retry time (maybe stale)");
   BoolSyncStat are_notifications_enabled(section_network,
                                          "Notifications Enabled");
 
-  base::ListValue* section_encryption = AddSection(stats_list, "Encryption");
+  base::ListValue* section_encryption =
+      AddSection(stats_list.get(), "Encryption");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_encryption->Reserve(9);
   BoolSyncStat is_using_explicit_passphrase(section_encryption,
                                             "Explicit Passphrase");
   BoolSyncStat is_passphrase_required(section_encryption,
                                       "Passphrase Required");
   BoolSyncStat is_cryptographer_ready(section_encryption,
                                       "Cryptographer Ready");
   BoolSyncStat has_pending_keys(section_encryption,
                                 "Cryptographer Has Pending Keys");
   StringSyncStat encrypted_types(section_encryption, "Encrypted Types");
   BoolSyncStat has_keystore_key(section_encryption, "Has Keystore Key");
   StringSyncStat keystore_migration_time(section_encryption,
                                          "Keystore Migration Time");
   StringSyncStat passphrase_type(section_encryption, "Passphrase Type");
   StringSyncStat passphrase_time(section_encryption, "Passphrase Time");
 
   base::ListValue* section_last_session =
-      AddSection(stats_list, "Status from Last Completed Session");
+      AddSection(stats_list.get(), "Status from Last Completed Session");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_last_session->Reserve(4);
   StringSyncStat session_source(section_last_session, "Sync Source");
   StringSyncStat get_key_result(section_last_session, "GetKey Step Result");
   StringSyncStat download_result(section_last_session, "Download Step Result");
   StringSyncStat commit_result(section_last_session, "Commit Step Result");
 
-  base::ListValue* section_counters = AddSection(stats_list, "Running Totals");
+  base::ListValue* section_counters =
+      AddSection(stats_list.get(), "Running Totals");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_counters->Reserve(7);
   IntSyncStat notifications_received(section_counters,
                                      "Notifications Received");
   IntSyncStat updates_received(section_counters, "Updates Downloaded");
   IntSyncStat tombstone_updates(section_counters, "Tombstone Updates");
   IntSyncStat reflected_updates(section_counters, "Reflected Updates");
   IntSyncStat successful_commits(section_counters, "Successful Commits");
   IntSyncStat conflicts_resolved_local_wins(section_counters,
                                             "Conflicts Resolved: Client Wins");
   IntSyncStat conflicts_resolved_server_wins(section_counters,
                                              "Conflicts Resolved: Server Wins");
 
   base::ListValue* section_this_cycle =
-      AddSection(stats_list, "Transient Counters (this cycle)");
+      AddSection(stats_list.get(), "Transient Counters (this cycle)");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_this_cycle->Reserve(4);
   IntSyncStat encryption_conflicts(section_this_cycle, "Encryption Conflicts");
   IntSyncStat hierarchy_conflicts(section_this_cycle, "Hierarchy Conflicts");
   IntSyncStat server_conflicts(section_this_cycle, "Server Conflicts");
   IntSyncStat committed_items(section_this_cycle, "Committed Items");
 
-  base::ListValue* section_that_cycle = AddSection(
-      stats_list, "Transient Counters (last cycle of last completed session)");
+  base::ListValue* section_that_cycle =
+      AddSection(stats_list.get(),
+                 "Transient Counters (last cycle of last completed session)");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_that_cycle->Reserve(3);
   IntSyncStat updates_downloaded(section_that_cycle, "Updates Downloaded");
   IntSyncStat committed_count(section_that_cycle, "Committed Count");
   IntSyncStat entries(section_that_cycle, "Entries");
 
   base::ListValue* section_nudge_info =
-      AddSection(stats_list, "Nudge Source Counters");
+      AddSection(stats_list.get(), "Nudge Source Counters");
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   section_nudge_info->Reserve(3);
   IntSyncStat nudge_source_notification(section_nudge_info,
                                         "Server Invalidations");
   IntSyncStat nudge_source_local(section_nudge_info, "Local Changes");
   IntSyncStat nudge_source_local_refresh(section_nudge_info, "Local Refreshes");
 
   // This list of sections belongs in the 'details' field of the returned
   // message.
-  about_info->Set(kDetailsKey, stats_list);
+  about_info->Set(kDetailsKey, std::move(stats_list));
 
   // Populate all the fields we declared above.
   client_version.SetValue(GetVersionString(channel));
 
   if (!service) {
     summary_string.SetValue("Sync service does not exist");
     return about_info;
   }
 
   SyncStatus full_status;
@@ skipping 119 matching lines @@
   const bool actionable_error_detected =
       full_status.sync_protocol_error.error_type != UNKNOWN_ERROR &&
       full_status.sync_protocol_error.error_type != SYNC_SUCCESS;
 
   about_info->SetBoolean("actionable_error_detected",
                          actionable_error_detected);
 
   // NOTE: We won't bother showing any of the following values unless
   // actionable_error_detected is set.
 
-  base::ListValue* actionable_error = new base::ListValue();
+  auto actionable_error = base::MakeUnique<base::ListValue>();
   // TODO(crbug.com/702230): Remove the usages of raw pointers in this file.
   actionable_error->Reserve(4);
-  about_info->Set("actionable_error", actionable_error);
 
-  StringSyncStat error_type(actionable_error, "Error Type");
-  StringSyncStat action(actionable_error, "Action");
-  StringSyncStat url(actionable_error, "URL");
-  StringSyncStat description(actionable_error, "Error Description");
+  StringSyncStat error_type(actionable_error.get(), "Error Type");
+  StringSyncStat action(actionable_error.get(), "Action");
+  StringSyncStat url(actionable_error.get(), "URL");
+  StringSyncStat description(actionable_error.get(), "Error Description");
+  about_info->Set("actionable_error", std::move(actionable_error));
 
   if (actionable_error_detected) {
     error_type.SetValue(
         GetSyncErrorTypeString(full_status.sync_protocol_error.error_type));
     action.SetValue(
         GetClientActionString(full_status.sync_protocol_error.action));
     url.SetValue(full_status.sync_protocol_error.url);
     description.SetValue(full_status.sync_protocol_error.error_description);
   }
 
@@ skipping 12 matching lines @@
   }
 
   about_info->Set("type_status", service->GetTypeStatusMap());
 
   return about_info;
 }
 
 }  // namespace sync_ui_util
 
 }  // namespace syncer