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

chrome/browser/ui/ash/chrome_launcher_prefs.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/ash/chrome_launcher_prefs.h"
 
 #include <stddef.h>
 
-#include <memory>
 #include <set>
-#include <utility>
 
 #include "ash/public/cpp/app_launch_id.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
@@ skipping 110 matching lines @@
   const base::DictionaryValue* current_display_prefs = nullptr;
   std::string current_value;
   if (current_shelf_prefs->GetDictionary(display_key, &current_display_prefs) &&
       current_display_prefs->GetString(pref_key, &current_value) &&
       current_value == value) {
     return;
   }
 
   DictionaryPrefUpdate update(prefs, prefs::kShelfPreferences);
   base::DictionaryValue* shelf_prefs = update.Get();
-  base::DictionaryValue* display_prefs_weak = nullptr;
-  if (!shelf_prefs->GetDictionary(display_key, &display_prefs_weak)) {
-    auto display_prefs = base::MakeUnique<base::DictionaryValue>();
-    display_prefs_weak = display_prefs.get();
-    shelf_prefs->Set(display_key, std::move(display_prefs));
+  base::DictionaryValue* display_prefs = nullptr;
+  if (!shelf_prefs->GetDictionary(display_key, &display_prefs)) {
+    display_prefs = new base::DictionaryValue();
+    shelf_prefs->Set(display_key, display_prefs);
   }
-  display_prefs_weak->SetStringWithoutPathExpansion(pref_key, value);
+  display_prefs->SetStringWithoutPathExpansion(pref_key, value);
 }
 
 ShelfAlignment AlignmentFromPref(const std::string& value) {
   if (value == kShelfAlignmentLeft)
     return SHELF_ALIGNMENT_LEFT;
   else if (value == kShelfAlignmentRight)
     return SHELF_ALIGNMENT_RIGHT;
   // Default to bottom.
   return SHELF_ALIGNMENT_BOTTOM;
 }
@@ skipping 605 matching lines @@
     pin_position = position_before.CreateAfter();
   else if (position_after.IsValid())
     pin_position = position_after.CreateBefore();
   else
     pin_position = syncer::StringOrdinal::CreateInitialOrdinal();
   app_service->SetPinPosition(app_id, pin_position);
 }
 
 }  // namespace launcher
 }  // namespace ash