Move TestingPrefService to use unique_ptr<Value>

components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc

 // Copyright 2014 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/bookmarks/managed/managed_bookmarks_tracker.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 93 matching lines @@
       const std::string& url) {
     EXPECT_TRUE(GURL(url).is_valid());
     std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
     dict->SetString("name", title);
     dict->SetString("url", GURL(url).spec());
     return dict;
   }
 
   static std::unique_ptr<base::DictionaryValue> CreateFolder(
       const std::string& title,
-      base::ListValue* children) {
+      std::unique_ptr<base::ListValue> children) {
     std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
     dict->SetString("name", title);
-    dict->Set("children", children);
+    dict->Set("children", std::move(children));
     return dict;
   }
 
-  static base::ListValue* CreateTestTree() {
-    base::ListValue* folder = new base::ListValue();
-    base::ListValue* empty = new base::ListValue();
-    folder->Append(CreateFolder("Empty", empty));
+  static std::unique_ptr<base::ListValue> CreateTestTree() {
+    auto folder = base::MakeUnique<base::ListValue>();
+    folder->Append(CreateFolder("Empty", base::MakeUnique<base::ListValue>()));
     folder->Append(CreateBookmark("Youtube", "http://youtube.com/"));
 
-    base::ListValue* list = new base::ListValue();
+    auto list = base::MakeUnique<base::ListValue>();
     list->Append(CreateBookmark("Google", "http://google.com/"));
-    list->Append(CreateFolder("Folder", folder));
+    list->Append(CreateFolder("Folder", std::move(folder)));
 
     return list;
   }
 
   static std::string GetManagementDomain() {
     return std::string();
   }
 
   static std::string GetManagedFolderTitle() {
     return l10n_util::GetStringUTF8(
@@ skipping 101 matching lines @@
 
   // Swap the Google bookmark with the Folder.
   std::unique_ptr<base::ListValue> updated(CreateTestTree());
   std::unique_ptr<base::Value> removed;
   ASSERT_TRUE(updated->Remove(0, &removed));
   updated->Append(std::move(removed));
 
   // These two nodes should just be swapped.
   const BookmarkNode* parent = managed_node();
   EXPECT_CALL(observer_, BookmarkNodeMoved(model_.get(), parent, 1, parent, 0));
-  prefs_.SetManagedPref(prefs::kManagedBookmarks, updated->DeepCopy());
+  prefs_.SetManagedPref(prefs::kManagedBookmarks, updated->CreateDeepCopy());
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Verify the final tree.
   std::unique_ptr<base::DictionaryValue> expected(
-      CreateFolder(GetManagedFolderTitle(), updated.release()));
+      CreateFolder(GetManagedFolderTitle(), std::move(updated)));
   EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
 }
 
 TEST_F(ManagedBookmarksTrackerTest, RemoveNode) {
   prefs_.SetManagedPref(prefs::kManagedBookmarks, CreateTestTree());
   CreateModel(false /* is_supervised */);
 
   // Remove the Folder.
   std::unique_ptr<base::ListValue> updated(CreateTestTree());
   ASSERT_TRUE(updated->Remove(1, NULL));
 
   const BookmarkNode* parent = managed_node();
   EXPECT_CALL(observer_, BookmarkNodeRemoved(model_.get(), parent, 1, _, _));
-  prefs_.SetManagedPref(prefs::kManagedBookmarks, updated->DeepCopy());
+  prefs_.SetManagedPref(prefs::kManagedBookmarks, updated->CreateDeepCopy());
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Verify the final tree.
   std::unique_ptr<base::DictionaryValue> expected(
-      CreateFolder(GetManagedFolderTitle(), updated.release()));
+      CreateFolder(GetManagedFolderTitle(), std::move(updated)));
   EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
 }
 
 TEST_F(ManagedBookmarksTrackerTest, CreateNewNodes) {
   prefs_.SetManagedPref(prefs::kManagedBookmarks, CreateTestTree());
   CreateModel(false /* is_supervised */);
 
   // Put all the nodes inside another folder.
   std::unique_ptr<base::ListValue> updated(new base::ListValue);
   updated->Append(CreateFolder("Container", CreateTestTree()));
 
   EXPECT_CALL(observer_, BookmarkNodeAdded(model_.get(), _, _)).Times(5);
   // The remaining nodes have been pushed to positions 1 and 2; they'll both be
   // removed when at position 1.
   const BookmarkNode* parent = managed_node();
   EXPECT_CALL(observer_, BookmarkNodeRemoved(model_.get(), parent, 1, _, _))
       .Times(2);
-  prefs_.SetManagedPref(prefs::kManagedBookmarks, updated->DeepCopy());
+  prefs_.SetManagedPref(prefs::kManagedBookmarks, updated->CreateDeepCopy());
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Verify the final tree.
   std::unique_ptr<base::DictionaryValue> expected(
-      CreateFolder(GetManagedFolderTitle(), updated.release()));
+      CreateFolder(GetManagedFolderTitle(), std::move(updated)));
   EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
 }
 
 TEST_F(ManagedBookmarksTrackerTest, RemoveAll) {
   prefs_.SetManagedPref(prefs::kManagedBookmarks, CreateTestTree());
   CreateModel(false /* is_supervised */);
   EXPECT_TRUE(managed_node()->IsVisible());
 
   // Remove the policy.
   const BookmarkNode* parent = managed_node();
@@ skipping 46 matching lines @@
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _));
   model_->RemoveAllUserBookmarks();
   EXPECT_EQ(2, managed_node()->child_count());
   EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
   Mock::VerifyAndClearExpectations(&observer_);
 }
 
 }  // namespace bookmarks