More base::Values-related bare pointer -> scoped_ptr conversions

chrome/browser/ui/webui/options/cookies_view_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/cookies_view_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 123 matching lines @@
                                         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);
   CookieTreeNode* parent_node = tree_model->AsNode(parent);
 
-  base::ListValue* children = new base::ListValue;
-  model_util_->GetChildNodeList(parent_node, start, count, children);
+  scoped_ptr<base::ListValue> children(new base::ListValue);
+  model_util_->GetChildNodeList(parent_node, start, count, children.get());
 
   base::ListValue args;
-  args.Append(parent == tree_model->GetRoot() ?
-      base::Value::CreateNullValue() :
-      new base::StringValue(model_util_->GetTreeNodeId(parent_node)));
-  args.Append(new base::FundamentalValue(start));
-  args.Append(children);
+  if (parent == tree_model->GetRoot())
+    args.Append(base::Value::CreateNullValue());
+  else
+    args.AppendString(model_util_->GetTreeNodeId(parent_node));
+  args.AppendInteger(start);
+  args.Append(children.Pass());
   web_ui()->CallJavascriptFunction("CookiesView.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::ListValue args;
-  args.Append(parent == tree_model->GetRoot() ?
-      base::Value::CreateNullValue() :
-      new base::StringValue(model_util_->GetTreeNodeId(
-          tree_model->AsNode(parent))));
-  args.Append(new base::FundamentalValue(start));
-  args.Append(new base::FundamentalValue(count));
+  if (parent == tree_model->GetRoot())
+    args.Append(base::Value::CreateNullValue());
+  else
+    args.AppendString(model_util_->GetTreeNodeId(tree_model->AsNode(parent)));
+  args.AppendInteger(start);
+  args.AppendInteger(count);
   web_ui()->CallJavascriptFunction("CookiesView.onTreeItemRemoved", args);
 }
 
 void CookiesViewHandler::TreeModelBeginBatch(CookiesTreeModel* model) {
   DCHECK(!batch_update_);  // There should be no nested batch begin.
   batch_update_ = true;
 }
 
 void CookiesViewHandler::TreeModelEndBatch(CookiesTreeModel* model) {
   DCHECK(batch_update_);
@@ skipping 68 matching lines @@
 
   EnsureCookiesTreeModelCreated();
 
   const CookieTreeNode* node = model_util_->GetTreeNodeFromPath(
       cookies_tree_model_->GetRoot(), node_path);
   if (node)
     SendChildren(node);
 }
 
 void CookiesViewHandler::SendChildren(const CookieTreeNode* parent) {
-  base::ListValue* children = new base::ListValue;
+  scoped_ptr<base::ListValue> children(new base::ListValue);
   model_util_->GetChildNodeList(parent, 0, parent->child_count(),
-      children);
+                                children.get());
 
   base::ListValue args;
-  args.Append(parent == cookies_tree_model_->GetRoot() ?
-      base::Value::CreateNullValue() :
-      new base::StringValue(model_util_->GetTreeNodeId(parent)));
-  args.Append(children);
+  if (parent == cookies_tree_model_->GetRoot())
+    args.Append(base::Value::CreateNullValue());
+  else
+    args.AppendString(model_util_->GetTreeNodeId(parent));
+  args.Append(children.Pass());
 
   web_ui()->CallJavascriptFunction("CookiesView.loadChildren", args);
 }
 
 void CookiesViewHandler::ReloadCookies(const base::ListValue* args) {
   cookies_tree_model_.reset();
 
   EnsureCookiesTreeModelCreated();
 }
 
 }  // namespace options