Update some base::Value API usage in InspectUI.

Fix lint errors along the way.

Change-Id: If87c1c8c330d191e1ca0d422c4d2bce299b24ce5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838709Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702738}

chrome/browser/ui/webui/inspect_ui.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/inspect_ui.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
@@ -69,14 +71,14 @@ const char kInspectUiNameField[] = "name";
 const char kInspectUiUrlField[] = "url";
 const char kInspectUiIsAdditionalField[] = "isAdditional";
 
-base::ListValue GetUiDevToolsTargets() {
-  base::ListValue targets;
+base::Value GetUiDevToolsTargets() {
+  base::Value targets(base::Value::Type::LIST);
   for (const auto& client_pair :
        ui_devtools::UiDevToolsServer::GetClientNamesAndUrls()) {
-    auto target_data = std::make_unique<base::DictionaryValue>();
-    target_data->SetString(kInspectUiNameField, client_pair.first);
-    target_data->SetString(kInspectUiUrlField, client_pair.second);
-    target_data->SetBoolean(kInspectUiIsAdditionalField, true);
+    base::Value target_data(base::Value::Type::DICTIONARY);
+    target_data.SetStringKey(kInspectUiNameField, client_pair.first);
+    target_data.SetStringKey(kInspectUiUrlField, client_pair.second);
+    target_data.SetBoolKey(kInspectUiIsAdditionalField, true);
     targets.Append(std::move(target_data));
   }
   return targets;
@@ -513,8 +515,7 @@ void InspectUI::StartListeningNotifications() {
   DevToolsTargetsUIHandler::Callback callback =
       base::Bind(&InspectUI::PopulateTargets, base::Unretained(this));
 
-  base::ListValue additional_targets = GetUiDevToolsTargets();
-  PopulateAdditionalTargets(additional_targets);
+  PopulateAdditionalTargets(GetUiDevToolsTargets());
 
   AddTargetUIHandler(
       DevToolsTargetsUIHandler::CreateForLocal(callback, profile));
@@ -666,7 +667,7 @@ void InspectUI::PopulateTargets(const std::string& source,
                                          targets);
 }
 
-void InspectUI::PopulateAdditionalTargets(const base::ListValue& targets) {
+void InspectUI::PopulateAdditionalTargets(const base::Value& targets) {
   web_ui()->CallJavascriptFunctionUnsafe("populateAdditionalTargets", targets);
 }
 

chrome/browser/ui/webui/inspect_ui.h

@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -86,7 +87,7 @@ class InspectUI : public content::WebUIController,
   void PopulateTargets(const std::string& source_id,
                        const base::ListValue& targets);
 
-  void PopulateAdditionalTargets(const base::ListValue& targets);
+  void PopulateAdditionalTargets(const base::Value& targets);
 
   void PopulatePortStatus(const base::Value& status);