more changes

chrome/browser/ui/webui/cookies_tree_model_adapter.cc

 // Copyright (c) 2011 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/cookies_tree_model_adapter.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
@@ skipping 52 matching lines @@
                                              int start,
                                              int count) {
   // Skip if there is a batch update in progress.
   if (batch_update_)
     return;
 
   CookieTreeNode* parent_node = model_->AsNode(parent);
 
   base::StringValue tree_id(tree_id_);
   scoped_ptr<Value> parend_id(GetTreeNodeId(parent_node));
-  base::FundamentalValue start_value(start);
+  base::NumberValue start_value(start);
   base::ListValue children;
   cookies_tree_model_util::GetChildNodeList(parent_node, start, count,
                                             &children);
   web_ui_->CallJavascriptFunction("ui.CookiesTree.onTreeItemAdded",
       tree_id, *parend_id.get(), start_value, children);
 }
 
 void CookiesTreeModelAdapter::TreeNodesRemoved(ui::TreeModel* model,
                                                ui::TreeModelNode* parent,
                                                int start,
                                                int count) {
   // Skip if there is a batch update in progress.
   if (batch_update_)
     return;
 
   base::StringValue tree_id(tree_id_);
   scoped_ptr<Value> parend_id(GetTreeNodeId(model_->AsNode(parent)));
-  base::FundamentalValue start_value(start);
-  base::FundamentalValue count_value(count);
+  base::NumberValue start_value(start);
+  base::NumberValue count_value(count);
   web_ui_->CallJavascriptFunction("ui.CookiesTree.onTreeItemRemoved",
       tree_id, *parend_id.get(), start_value, count_value);
 }
 
 void CookiesTreeModelAdapter::TreeModelBeginBatch(CookiesTreeModel* model) {
   DCHECK(!batch_update_);  // There should be no nested batch begin.
   batch_update_ = true;
 }
 
 void CookiesTreeModelAdapter::TreeModelEndBatch(CookiesTreeModel* model) {
@@ skipping 18 matching lines @@
   scoped_ptr<Value> parend_id(GetTreeNodeId(model_->AsNode(parent)));
   ListValue children;
   cookies_tree_model_util::GetChildNodeList(parent, 0, parent->child_count(),
       &children);
   web_ui_->CallJavascriptFunction("ui.CookiesTree.setChildren",
       tree_id, *parend_id.get(), children);
 }
 
 Value* CookiesTreeModelAdapter::GetTreeNodeId(CookieTreeNode* node) {
   if (node == model_->GetRoot())
-    return Value::CreateNullValue();
+    return base::NullValue();
 
-  return Value::CreateStringValue(
+  return base::StringValue::New(
       cookies_tree_model_util::GetTreeNodeId(node));
 }