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

chrome/browser/extensions/extension_bookmarks_module.cc

 // Copyright (c) 2010 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/extensions/extension_bookmarks_module.h"
 
 #include "base/json/json_writer.h"
 #include "base/sha1.h"
 #include "base/stl_util-inl.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_bookmark_helpers.h"
 #include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
 #include "chrome/browser/importer/importer.h"
@@ skipping 28 matching lines @@
     NotificationService::current()->Notify(
         NotificationType::EXTENSION_BOOKMARKS_API_INVOKED,
         Source<const Extension>(GetExtension()),
         Details<const BookmarksFunction>(this));
   }
   SendResponse(success);
 }
 
 bool BookmarksFunction::GetBookmarkIdAsInt64(
     const std::string& id_string, int64* id) {
-  if (StringToInt64(id_string, id))
+  if (base::StringToInt64(id_string, id))
     return true;
 
   error_ = keys::kInvalidIdError;
   return false;
 }
 
 void BookmarksFunction::Observe(NotificationType type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   DCHECK(type == NotificationType::BOOKMARK_MODEL_LOADED);
@@ skipping 35 matching lines @@
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeMoved(
     BookmarkModel* model,
     const BookmarkNode* old_parent,
     int old_index,
     const BookmarkNode* new_parent,
     int new_index) {
   ListValue args;
   const BookmarkNode* node = new_parent->GetChild(new_index);
-  args.Append(new StringValue(Int64ToString(node->id())));
+  args.Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->SetString(keys::kParentIdKey, Int64ToString(new_parent->id()));
+  object_args->SetString(keys::kParentIdKey,
+                         base::Int64ToString(new_parent->id()));
   object_args->SetInteger(keys::kIndexKey, new_index);
   object_args->SetString(keys::kOldParentIdKey,
-                         Int64ToString(old_parent->id()));
+                         base::Int64ToString(old_parent->id()));
   object_args->SetInteger(keys::kOldIndexKey, old_index);
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(), keys::kOnBookmarkMoved, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
                                                      const BookmarkNode* parent,
                                                      int index) {
   ListValue args;
   const BookmarkNode* node = parent->GetChild(index);
-  args.Append(new StringValue(Int64ToString(node->id())));
+  args.Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* obj =
       extension_bookmark_helpers::GetNodeDictionary(node, false, false);
   args.Append(obj);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(), keys::kOnBookmarkCreated, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeRemoved(
     BookmarkModel* model,
     const BookmarkNode* parent,
     int index,
     const BookmarkNode* node) {
   ListValue args;
-  args.Append(new StringValue(Int64ToString(node->id())));
+  args.Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->SetString(keys::kParentIdKey, Int64ToString(parent->id()));
+  object_args->SetString(keys::kParentIdKey,
+                         base::Int64ToString(parent->id()));
   object_args->SetInteger(keys::kIndexKey, index);
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(), keys::kOnBookmarkRemoved, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeChanged(
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
-  args.Append(new StringValue(Int64ToString(node->id())));
+  args.Append(new StringValue(base::Int64ToString(node->id())));
 
   // TODO(erikkay) The only three things that BookmarkModel sends this
   // notification for are title, url and favicon.  Since we're currently
   // ignoring favicon and since the notification doesn't say which one anyway,
   // for now we only include title and url.  The ideal thing would be to change
   // BookmarkModel to indicate what changed.
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetString(keys::kTitleKey, node->GetTitle());
   if (node->is_url())
     object_args->SetString(keys::kUrlKey, node->GetURL().spec());
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(), keys::kOnBookmarkChanged, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeFavIconLoaded(
     BookmarkModel* model, const BookmarkNode* node) {
   // TODO(erikkay) anything we should do here?
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeChildrenReordered(
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
-  args.Append(new StringValue(Int64ToString(node->id())));
+  args.Append(new StringValue(base::Int64ToString(node->id())));
   int childCount = node->GetChildCount();
   ListValue* children = new ListValue();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
-    Value* child_id = new StringValue(Int64ToString(child->id()));
+    Value* child_id = new StringValue(base::Int64ToString(child->id()));
     children->Append(child_id);
   }
   DictionaryValue* reorder_info = new DictionaryValue();
   reorder_info->Set(keys::kChildIdsKey, children);
   args.Append(reorder_info);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(),
                 keys::kOnBookmarkChildrenReordered,
@@ skipping 134 matching lines @@
 }
 
 // static
 bool RemoveBookmarkFunction::ExtractIds(const ListValue* args,
                                         std::list<int64>* ids,
                                         bool* invalid_id) {
   std::string id_string;
   if (!args->GetString(0, &id_string))
     return false;
   int64 id;
-  if (StringToInt64(id_string, &id))
+  if (base::StringToInt64(id_string, &id))
     ids->push_back(id);
   else
     *invalid_id = true;
   return true;
 }
 
 bool RemoveBookmarkFunction::RunImpl() {
   std::list<int64> ids;
   bool invalid_id = false;
   EXTENSION_FUNCTION_VALIDATE(ExtractIds(args_.get(), &ids, &invalid_id));
@@ skipping 250 matching lines @@
     DictionaryValue* json;
     if (!args->GetDictionary(0, &json))
       return;
 
     std::string parent_id;
     if (json->HasKey(keys::kParentIdKey)) {
       if (!json->GetString(keys::kParentIdKey, &parent_id))
         return;
     }
     BookmarkModel* model = profile_->GetBookmarkModel();
-    const BookmarkNode* parent = model->GetNodeByID(StringToInt64(parent_id));
+
+    int64 parent_id_int64;
+    base::StringToInt64(parent_id, &parent_id_int64);
+    const BookmarkNode* parent = model->GetNodeByID(parent_id_int64);
     if (!parent)
       return;
 
     std::string bucket_id = WideToUTF8(parent->GetTitle());
     std::wstring title;
     json->GetString(keys::kTitleKey, &title);
     std::string url_string;
     json->GetString(keys::kUrlKey, &url_string);
 
     bucket_id += WideToUTF8(title);
@@ skipping 180 matching lines @@
   SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE);
   return true;
 }
 
 void ExportBookmarksFunction::FileSelected(const FilePath& path,
                                            int index,
                                            void* params) {
   bookmark_html_writer::WriteBookmarks(profile(), path, NULL);
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }