Move the number conversions from string_util to a new file....

chrome/browser/bookmarks/bookmark_codec.cc

 // Copyright (c) 2009 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/bookmarks/bookmark_codec.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 
 using base::Time;
 
 const wchar_t* BookmarkCodec::kRootsKey = L"roots";
 const wchar_t* BookmarkCodec::kRootFolderNameKey = L"bookmark_bar";
@@ skipping 57 matching lines @@
   // If either the checksums differ or some IDs were missing/not unique,
   // reassign IDs.
   if (!ids_valid_ || computed_checksum() != stored_checksum())
     ReassignIDs(bb_node, other_folder_node);
   *max_id = maximum_id_ + 1;
   return success;
 }
 
 Value* BookmarkCodec::EncodeNode(const BookmarkNode* node) {
   DictionaryValue* value = new DictionaryValue();
-  std::string id = Int64ToString(node->id());
+  std::string id = base::Int64ToString(node->id());
   value->SetString(kIdKey, id);
   const string16& title = node->GetTitleAsString16();
   value->SetStringFromUTF16(kNameKey, title);
   value->SetString(kDateAddedKey,
-                   Int64ToString(node->date_added().ToInternalValue()));
+                   base::Int64ToString(node->date_added().ToInternalValue()));
   if (node->type() == BookmarkNode::URL) {
     value->SetString(kTypeKey, kTypeURL);
     std::string url = node->GetURL().possibly_invalid_spec();
     value->SetString(kURLKey, url);
     UpdateChecksumWithUrlNode(id, title, url);
   } else {
     value->SetString(kTypeKey, kTypeFolder);
     value->SetString(kDateModifiedKey,
-                     Int64ToString(node->date_group_modified().
+                     base::Int64ToString(node->date_group_modified().
                                    ToInternalValue()));
     UpdateChecksumWithFolderNode(id, title);
 
     ListValue* child_values = new ListValue();
     value->Set(kChildrenKey, child_values);
     for (int i = 0; i < node->GetChildCount(); ++i)
       child_values->Append(EncodeNode(node->GetChild(i)));
   }
   return value;
 }
@@ skipping 88 matching lines @@
     }
   }
 
   maximum_id_ = std::max(maximum_id_, id);
 
   string16 title;
   value.GetStringAsUTF16(kNameKey, &title);
 
   std::string date_added_string;
   if (!value.GetString(kDateAddedKey, &date_added_string))
-    date_added_string = Int64ToString(Time::Now().ToInternalValue());
+    date_added_string = base::Int64ToString(Time::Now().ToInternalValue());
   base::Time date_added = base::Time::FromInternalValue(
       StringToInt64(date_added_string));
 #if !defined(OS_WIN)
   // We changed the epoch for dates on Mac & Linux from 1970 to the Windows
   // one of 1601. We assume any number we encounter from before 1970 is using
   // the old format, so we need to add the delta to it.
   //
   // This code should be removed at some point:
   // http://code.google.com/p/chromium/issues/detail?id=20264
   if (date_added.ToInternalValue() <
@@ skipping 21 matching lines @@
     else
       return false;  // Node invalid.
 
     if (parent)
       parent->Add(parent->GetChildCount(), node);
     node->set_type(BookmarkNode::URL);
     UpdateChecksumWithUrlNode(id_string, title, url_string);
   } else {
     std::string last_modified_date;
     if (!value.GetString(kDateModifiedKey, &last_modified_date))
-      last_modified_date = Int64ToString(Time::Now().ToInternalValue());
+      last_modified_date = base::Int64ToString(Time::Now().ToInternalValue());
 
     Value* child_values;
     if (!value.Get(kChildrenKey, &child_values))
       return false;
 
     if (child_values->GetType() != Value::TYPE_LIST)
       return false;
 
     if (!node) {
       node = new BookmarkNode(id, GURL());
@@ skipping 62 matching lines @@
 
 void BookmarkCodec::InitializeChecksum() {
   MD5Init(&md5_context_);
 }
 
 void BookmarkCodec::FinalizeChecksum() {
   MD5Digest digest;
   MD5Final(&digest, &md5_context_);
   computed_checksum_ = MD5DigestToBase16(digest);
 }