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

chrome/browser/ui/webui/options/chromeos/display_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/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 164 matching lines @@
   result->SetBoolean("isBest",
                      is_internal ? (mode->ui_scale() == 1.0f) : mode->native());
   result->SetBoolean("isNative", mode->native());
   result->SetBoolean(
       "selected",
       mode->IsEquivalent(
           GetDisplayManager()->GetActiveModeForDisplayId(display_id)));
   return result;
 }
 
-std::unique_ptr<base::DictionaryValue> ConvertBoundsToValue(
-    const gfx::Rect& bounds) {
-  auto result = base::MakeUnique<base::DictionaryValue>();
+base::DictionaryValue* ConvertBoundsToValue(const gfx::Rect& bounds) {
+  base::DictionaryValue* result = new base::DictionaryValue();
   result->SetInteger("left", bounds.x());
   result->SetInteger("top", bounds.y());
   result->SetInteger("width", bounds.width());
   result->SetInteger("height", bounds.height());
   return result;
 }
 
 }  // namespace
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
@@ skipping 125 matching lines @@
 
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   std::unique_ptr<base::ListValue> js_displays(new base::ListValue);
   for (const display::Display& display : displays) {
     const display::ManagedDisplayInfo& display_info =
         display_manager->GetDisplayInfo(display.id());
     auto js_display = base::MakeUnique<base::DictionaryValue>();
     js_display->SetString("id", base::Int64ToString(display.id()));
     js_display->SetString("name",
                           display_manager->GetDisplayNameForId(display.id()));
-    js_display->Set("bounds", ConvertBoundsToValue(display.bounds()));
+    base::DictionaryValue* display_bounds =
+        ConvertBoundsToValue(display.bounds());
+    js_display->Set("bounds", display_bounds);
     js_display->SetBoolean("isPrimary", display.id() == primary_id);
     js_display->SetBoolean("isInternal", display.IsInternal());
     js_display->SetInteger("rotation", display.RotationAsDegree());
 
-    auto js_resolutions = base::MakeUnique<base::ListValue>();
+    base::ListValue* js_resolutions = new base::ListValue();
     for (const scoped_refptr<display::ManagedDisplayMode>& display_mode :
          display_info.display_modes()) {
       js_resolutions->Append(
           ConvertDisplayModeToValue(display.id(), display_mode));
     }
-    js_display->Set("resolutions", std::move(js_resolutions));
+    js_display->Set("resolutions", js_resolutions);
 
     js_display->SetInteger("colorProfileId", display_info.color_profile());
-    auto available_color_profiles = base::MakeUnique<base::ListValue>();
+    base::ListValue* available_color_profiles = new base::ListValue();
     for (const auto& color_profile : display_info.available_color_profiles()) {
       const base::string16 profile_name = GetColorProfileName(color_profile);
       if (profile_name.empty())
         continue;
       auto color_profile_dict = base::MakeUnique<base::DictionaryValue>();
       color_profile_dict->SetInteger("profileId", color_profile);
       color_profile_dict->SetString("name", profile_name);
       available_color_profiles->Append(std::move(color_profile_dict));
     }
-    js_display->Set("availableColorProfiles",
-                    std::move(available_color_profiles));
+    js_display->Set("availableColorProfiles", available_color_profiles);
 
     if (display_manager->GetNumDisplays() > 1) {
       // The settings UI must use the resolved display layout to show the
       // actual applied layout.
       const display::DisplayPlacement placement =
           display_manager->GetCurrentResolvedDisplayLayout().FindPlacementById(
               display.id());
       if (placement.display_id != display::kInvalidDisplayId) {
         js_display->SetString(
             "parentId", base::Int64ToString(placement.parent_display_id));
@@ skipping 200 matching lines @@
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? display::DisplayManager::UNIFIED
              : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos