//storage: Convert base::(U)Int(64)ToString(16) to NumberToString(16)

The former non-overloaded variants are deprecated.

This is a mechanical change; there is no intended behavior change.

Bug: 929827
Change-Id: I4c58520e5cd8707df4ee8d383df595ebbdc5897a
Reviewed-on: https://chromium-review.googlesource.com/c/1461127
Commit-Queue: Raul Tambre <raul@tambre.ee>
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Auto-Submit: Raul Tambre <raul@tambre.ee>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630539}

storage/browser/blob/blob_url_request_job.cc

@@ -142,7 +142,7 @@ scoped_refptr<net::HttpResponseHeaders> BlobURLRequestJob::GenerateHeaders(
     uint64_t total_size,
     uint64_t content_size) {
   std::string status("HTTP/1.1 ");
-  status.append(base::IntToString(status_code));
+  status.append(base::NumberToString(status_code));
   status.append(" ");
   status.append(net::GetHttpReasonPhrase(status_code));
   status.append("\0\0", 2);

storage/browser/blob/view_blob_internals_job.cc

@@ -229,7 +229,7 @@ void ViewBlobInternalsJob::GenerateHTMLForBlobData(
     std::string* out) {
   StartHTMLList(out);
 
-  AddHTMLListItem(kRefcount, base::IntToString(refcount), out);
+  AddHTMLListItem(kRefcount, base::NumberToString(refcount), out);
   AddHTMLListItem(kStatus, StatusToString(blob_data.status()), out);
   if (!content_type.empty())
     AddHTMLListItem(kContentType, content_type, out);

storage/browser/database/database_tracker.cc

@@ -280,7 +280,7 @@ base::FilePath DatabaseTracker::GetOriginDirectory(
       origin_directory = it->second;
     } else {
       origin_directory =
-          base::IntToString16(incognito_origin_directories_generator_++);
+          base::NumberToString16(incognito_origin_directories_generator_++);
       incognito_origin_directories_[origin_identifier] = origin_directory;
     }
   }
@@ -302,7 +302,7 @@ base::FilePath DatabaseTracker::GetFullDBFilePath(
     return base::FilePath();
 
   return GetOriginDirectory(origin_identifier)
-      .AppendASCII(base::Int64ToString(id));
+      .AppendASCII(base::NumberToString(id));
 }
 
 bool DatabaseTracker::GetOriginInfo(const std::string& origin_identifier,

storage/browser/fileapi/sandbox_directory_database.cc

@@ -104,14 +104,14 @@ std::string GetChildLookupKey(
     const base::FilePath::StringType& child_name) {
   std::string name;
   name = storage::FilePathToString(base::FilePath(child_name));
-  return std::string(kChildLookupPrefix) + base::Int64ToString(parent_id) +
-      std::string(kChildLookupSeparator) + name;
+  return std::string(kChildLookupPrefix) + base::NumberToString(parent_id) +
+         std::string(kChildLookupSeparator) + name;
 }
 
 std::string GetChildListingKeyPrefix(
     storage::SandboxDirectoryDatabase::FileId parent_id) {
-  return std::string(kChildLookupPrefix) + base::Int64ToString(parent_id) +
-      std::string(kChildLookupSeparator);
+  return std::string(kChildLookupPrefix) + base::NumberToString(parent_id) +
+         std::string(kChildLookupSeparator);
 }
 
 const char* LastFileIdKey() {
@@ -124,7 +124,7 @@ const char* LastIntegerKey() {
 
 std::string GetFileLookupKey(
     storage::SandboxDirectoryDatabase::FileId file_id) {
-  return base::Int64ToString(file_id);
+  return base::NumberToString(file_id);
 }
 
 // Assumptions:
@@ -561,7 +561,7 @@ base::File::Error SandboxDirectoryDatabase::AddFileInfo(
   if (!AddFileInfoHelper(info, temp_id, &batch))
     return base::File::FILE_ERROR_FAILED;
 
-  batch.Put(LastFileIdKey(), base::Int64ToString(temp_id));
+  batch.Put(LastFileIdKey(), base::NumberToString(temp_id));
   status = db_->Write(leveldb::WriteOptions(), &batch);
   if (!status.ok()) {
     HandleError(FROM_HERE, status);
@@ -685,7 +685,7 @@ bool SandboxDirectoryDatabase::GetNextInteger(int64_t* next) {
     }
     ++temp;
     status = db_->Put(leveldb::WriteOptions(), LastIntegerKey(),
-        base::Int64ToString(temp));
+                      base::NumberToString(temp));
     if (!status.ok()) {
       HandleError(FROM_HERE, status);
       return false;
@@ -861,8 +861,8 @@ bool SandboxDirectoryDatabase::StoreDefaultValues() {
   leveldb::WriteBatch batch;
   if (!AddFileInfoHelper(root, 0, &batch))
     return false;
-  batch.Put(LastFileIdKey(), base::Int64ToString(0));
-  batch.Put(LastIntegerKey(), base::Int64ToString(-1));
+  batch.Put(LastFileIdKey(), base::NumberToString(0));
+  batch.Put(LastIntegerKey(), base::NumberToString(-1));
   leveldb::Status status = db_->Write(leveldb::WriteOptions(), &batch);
   if (!status.ok()) {
     HandleError(FROM_HERE, status);

storage/browser/fileapi/sandbox_directory_database_unittest.cc

@@ -119,21 +119,24 @@ class SandboxDirectoryDatabaseTest : public testing::Test {
   void MakeHierarchyLink(FileId parent_id,
                          FileId child_id,
                          const base::FilePath::StringType& name) {
-    ASSERT_TRUE(db()->db_->Put(
-        leveldb::WriteOptions(),
-        "CHILD_OF:" + base::Int64ToString(parent_id) + ":" +
-        FilePathToString(base::FilePath(name)),
-        base::Int64ToString(child_id)).ok());
+    ASSERT_TRUE(db()->db_
+                    ->Put(leveldb::WriteOptions(),
+                          "CHILD_OF:" + base::NumberToString(parent_id) + ":" +
+                              FilePathToString(base::FilePath(name)),
+                          base::NumberToString(child_id))
+                    .ok());
   }
 
   // Deletes link from parent of |file_id| to |file_id|.
   void DeleteHierarchyLink(FileId file_id) {
     FileInfo file_info;
     ASSERT_TRUE(db()->GetFileInfo(file_id, &file_info));
-    ASSERT_TRUE(db()->db_->Delete(
-        leveldb::WriteOptions(),
-        "CHILD_OF:" + base::Int64ToString(file_info.parent_id) + ":" +
-        FilePathToString(base::FilePath(file_info.name))).ok());
+    ASSERT_TRUE(
+        db()->db_
+            ->Delete(leveldb::WriteOptions(),
+                     "CHILD_OF:" + base::NumberToString(file_info.parent_id) +
+                         ":" + FilePathToString(base::FilePath(file_info.name)))
+            .ok());
   }
 
  protected:

storage/browser/quota/quota_manager.cc

@@ -1131,7 +1131,7 @@ std::map<std::string, std::string> QuotaManager::GetStatistics() {
     temporary_storage_evictor_->GetStatistics(&stats);
     for (const auto& origin_usage_pair : stats) {
       statistics[origin_usage_pair.first] =
-          base::Int64ToString(origin_usage_pair.second);
+          base::NumberToString(origin_usage_pair.second);
     }
   }
   return statistics;

storage/common/database/database_identifier.cc

@@ -189,7 +189,7 @@ std::string DatabaseIdentifier::ToString() const {
   if (is_unique_)
     return "__0";
   return scheme_ + "_" + EscapeIPv6Hostname(hostname_) + "_" +
-         base::IntToString(port_);
+         base::NumberToString(port_);
 }
 
 GURL DatabaseIdentifier::ToOrigin() const {
@@ -199,7 +199,7 @@ GURL DatabaseIdentifier::ToOrigin() const {
     return GURL();
   if (port_ == 0)
     return GURL(scheme_ + "://" + hostname_);
-  return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_));
+  return GURL(scheme_ + "://" + hostname_ + ":" + base::NumberToString(port_));
 }
 
 }  // namespace storage