Remove raw base::DictionaryValue::Set in //content

content/browser/accessibility/accessibility_ui.cc

 // Copyright (c) 2013 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 "content/browser/accessibility/accessibility_ui.h"
 
 #include <memory>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/accessibility/accessibility_tree_formatter.h"
 #include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
@@ skipping 117 matching lines @@
     if (static_cast<RenderViewHostImpl*>(rvh)->GetDelegate()->IsNeverVisible())
       continue;
     BrowserContext* context = rvh->GetProcess()->GetBrowserContext();
     if (context != current_context)
       continue;
 
     rvh_list->Append(BuildTargetDescriptor(rvh));
   }
 
   base::DictionaryValue data;
-  data.Set("list", rvh_list.release());
+  data.Set("list", std::move(rvh_list));
   AccessibilityMode mode =
       BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode();
   bool disabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableRendererAccessibility);
   bool native = mode.has_mode(AccessibilityMode::kNativeAPIs);
   bool web = mode.has_mode(AccessibilityMode::kWebContents);
   bool text = mode.has_mode(AccessibilityMode::kInlineTextBoxes);
   bool screenreader = mode.has_mode(AccessibilityMode::kScreenReader);
   bool html = mode.has_mode(AccessibilityMode::kHTML);
 
@@ skipping 159 matching lines @@
   CHECK(args->GetString(0, &process_id_str));
   CHECK(args->GetString(1, &route_id_str));
   CHECK(base::StringToInt(process_id_str, &process_id));
   CHECK(base::StringToInt(route_id_str, &route_id));
 
   RenderViewHost* rvh = RenderViewHost::FromID(process_id, route_id);
   if (!rvh) {
     std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
     result->SetInteger(kProcessIdField, process_id);
     result->SetInteger(kRouteIdField, route_id);
-    result->Set("error", new base::Value("Renderer no longer exists."));
+    result->SetString("error", "Renderer no longer exists.");
     web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
                                            *(result.get()));
     return;
   }
 
   std::unique_ptr<base::DictionaryValue> result(BuildTargetDescriptor(rvh));
   auto* web_contents =
       static_cast<WebContentsImpl*>(WebContents::FromRenderViewHost(rvh));
   // No matter the state of the current web_contents, we want to force the mode
   // because we are about to show the accessibility tree
   web_contents->SetAccessibilityMode(AccessibilityMode(
       AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents));
 
   std::unique_ptr<AccessibilityTreeFormatter> formatter;
   if (g_show_internal_accessibility_tree)
     formatter.reset(new AccessibilityTreeFormatterBlink());
   else
     formatter.reset(AccessibilityTreeFormatter::Create());
   base::string16 accessibility_contents_utf16;
   std::vector<AccessibilityTreeFormatter::Filter> filters;
   filters.push_back(AccessibilityTreeFormatter::Filter(
       base::ASCIIToUTF16("*"),
       AccessibilityTreeFormatter::Filter::ALLOW));
   formatter->SetFilters(filters);
   auto* ax_mgr = web_contents->GetOrCreateRootBrowserAccessibilityManager();
   DCHECK(ax_mgr);
   formatter->FormatAccessibilityTree(ax_mgr->GetRoot(),
                                      &accessibility_contents_utf16);
-  result->Set("tree",
-              new base::Value(base::UTF16ToUTF8(accessibility_contents_utf16)));
+  result->SetString("tree", base::UTF16ToUTF8(accessibility_contents_utf16));
   web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
                                          *(result.get()));
 }
 
 }  // namespace content