Remove base::Value::CreateNullValue

chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc

 // Copyright 2016 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/settings/settings_cookies_view_handler.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cache_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
@@ skipping 72 matching lines @@
 
   std::unique_ptr<base::ListValue> children(new base::ListValue);
   // Passing false for |include_quota_nodes| since they don't reflect reality
   // until bug http://crbug.com/642955 is fixed and local/session storage is
   // counted against the total.
   model_util_->GetChildNodeList(
       parent_node, start, count, /*include_quota_nodes=*/false, children.get());
 
   base::DictionaryValue args;
   if (parent == tree_model->GetRoot())
-    args.Set(kId, base::Value::CreateNullValue());
+    args.Set(kId, base::MakeUnique<base::Value>());
   else
     args.SetString(kId, model_util_->GetTreeNodeId(parent_node));
   args.SetInteger(kStart, start);
   args.Set(kChildren, std::move(children));
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::Value("onTreeItemAdded"), args);
 }
 
 void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model,
                                           ui::TreeModelNode* parent,
                                           int start,
                                           int count) {
   // Skip if there is a batch update in progress.
   if (batch_update_)
     return;
 
   CookiesTreeModel* tree_model = static_cast<CookiesTreeModel*>(model);
 
   base::DictionaryValue args;
   if (parent == tree_model->GetRoot())
-    args.Set(kId, base::Value::CreateNullValue());
+    args.Set(kId, base::MakeUnique<base::Value>());
   else
     args.SetString(kId, model_util_->GetTreeNodeId(tree_model->AsNode(parent)));
   args.SetInteger(kStart, start);
   args.SetInteger(kCount, count);
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::Value("onTreeItemRemoved"), args);
 }
 
 void CookiesViewHandler::TreeModelBeginBatch(CookiesTreeModel* model) {
   DCHECK(!batch_update_);  // There should be no nested batch begin.
@@ skipping 53 matching lines @@
   CHECK_EQ(2U, args->GetSize());
   CHECK(args->GetString(0, &callback_id_));
   std::string site;
   CHECK(args->GetString(1, &site));
 
   AllowJavascript();
   const CookieTreeNode* node = model_util_->GetTreeNodeFromTitle(
       cookies_tree_model_->GetRoot(), base::UTF8ToUTF16(site));
 
   if (!node) {
-    RejectJavascriptCallback(base::Value(callback_id_),
-                             *base::Value::CreateNullValue());
+    RejectJavascriptCallback(base::Value(callback_id_), base::Value());
     callback_id_.clear();
     return;
   }
 
   SendCookieDetails(node);
 }
 
 void CookiesViewHandler::HandleReloadCookies(const base::ListValue* args) {
   CHECK_EQ(1U, args->GetSize());
   CHECK(args->GetString(0, &callback_id_));
@@ skipping 36 matching lines @@
 void CookiesViewHandler::SendChildren(const CookieTreeNode* parent) {
   std::unique_ptr<base::ListValue> children(new base::ListValue);
   // Passing false for |include_quota_nodes| since they don't reflect reality
   // until bug http://crbug.com/642955 is fixed and local/session storage is
   // counted against the total.
   model_util_->GetChildNodeList(parent, /*start=*/0, parent->child_count(),
       /*include_quota_nodes=*/false, children.get());
 
   base::DictionaryValue args;
   if (parent == cookies_tree_model_->GetRoot())
-    args.Set(kId, base::Value::CreateNullValue());
+    args.Set(kId, base::MakeUnique<base::Value>());
   else
     args.SetString(kId, model_util_->GetTreeNodeId(parent));
   args.Set(kChildren, std::move(children));
 
   ResolveJavascriptCallback(base::Value(callback_id_), args);
   callback_id_.clear();
 }
 
 void CookiesViewHandler::SendCookieDetails(const CookieTreeNode* parent) {
   std::unique_ptr<base::ListValue> children(new base::ListValue);
   // Passing false for |include_quota_nodes| since they don't reflect reality
   // until bug http://crbug.com/642955 is fixed and local/session storage is
   // counted against the total.
   model_util_->GetChildNodeDetails(parent, /*start=*/0, parent->child_count(),
                                    /*include_quota_nodes=*/false,
                                    children.get());
 
   base::DictionaryValue args;
   if (parent == cookies_tree_model_->GetRoot())
-    args.Set(kId, base::Value::CreateNullValue());
+    args.Set(kId, base::MakeUnique<base::Value>());
   else
     args.SetString(kId, model_util_->GetTreeNodeId(parent));
   args.Set(kChildren, std::move(children));
 
   ResolveJavascriptCallback(base::Value(callback_id_), args);
   callback_id_.clear();
 }
 
 }  // namespace settings