2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index 1f0ab8a..eb76c2b 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -10,6 +10,7 @@
 #include "base/file_version_info.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/path_service.h"
@@ -295,7 +296,7 @@ class JSONTest : public DiagnosticTest {
     scoped_ptr<Value> json_root(json.Deserialize(&error_code, &error_message));
     if (base::JSONReader::JSON_NO_ERROR != error_code) {
       if (error_message.empty()) {
-        error_message = "Parse error " + IntToString(error_code);
+        error_message = "Parse error " + base::IntToString(error_code);
       }
       RecordFailure(UTF8ToUTF16(error_message));
       return true;
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 1e21c22..5013fa9 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "third_party/sqlite/preprocessed/sqlite3.h"
@@ -58,7 +58,7 @@ class SqliteIntegrityTest : public DiagnosticTest {
           RecordFailure(ASCIIToUTF16("DB locked by another process"));
         } else {
           string16 str(ASCIIToUTF16("Pragma failed. Error: "));
-          str += IntToString16(error);
+          str += base::IntToString16(error);
           RecordFailure(str);
         }
         return false;
@@ -72,7 +72,7 @@ class SqliteIntegrityTest : public DiagnosticTest {
     // All done. Report to the user.
     if (errors != 0) {
       string16 str(ASCIIToUTF16("Database corruption detected :"));
-      str += IntToString16(errors) + ASCIIToUTF16(" errors");
+      str += base::IntToString16(errors) + ASCIIToUTF16(" errors");
       RecordFailure(str);
       return true;
     }