iwyu: Include stringprintf.h where appropriate, part 2.

BUG=82098
TEST=none

R=thakis@chromium.org

Review URL: http://codereview.chromium.org/7004007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85048 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 9 deletions

diff --git a/chrome/browser/diagnostics/diagnostics_main.cc b/chrome/browser/diagnostics/diagnostics_main.cc
index 6cbcb28..a54bd10 100644
--- a/chrome/browser/diagnostics/diagnostics_main.cc
+++ b/chrome/browser/diagnostics/diagnostics_main.cc
@@ -15,7 +15,8 @@
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
-#include "base/string_util.h"
+#include "base/logging.h"
+#include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -251,9 +252,13 @@ class TestWriter {
 std::wstring PrintableUSCurrentTime() {
   base::Time::Exploded exploded = {0};
   base::Time::Now().UTCExplode(&exploded);
-  return StringPrintf(L"%d:%d:%d.%d:%d:%d",
-      exploded.year, exploded.month, exploded.day_of_month,
-      exploded.hour, exploded.minute, exploded.second);
+  return base::StringPrintf(L"%d:%d:%d.%d:%d:%d",
+                            exploded.year,
+                            exploded.month,
+                            exploded.day_of_month,
+                            exploded.hour,
+                            exploded.minute,
+                            exploded.second);
 }
 
 // This class is a basic test controller. In this design the view (TestWriter)
@@ -282,7 +287,8 @@ class TestController : public DiagnosticsModel::Observer {
       return;
     }
     int count = model->GetTestAvailableCount();
-    writer_->WriteInfoText(StringPrintf(L"%d available test(s)\n\n", count));
+    writer_->WriteInfoText(base::StringPrintf(
+        L"%d available test(s)\n\n", count));
     model->RunAll(this);
   }
 
@@ -301,8 +307,8 @@ class TestController : public DiagnosticsModel::Observer {
 
   virtual void OnDoneAll(DiagnosticsModel* model) {
     if (writer_->failures() > 0) {
-      writer_->WriteInfoText(StringPrintf(L"DONE. %d failure(s)\n\n",
-                             writer_->failures()));
+      writer_->WriteInfoText(base::StringPrintf(
+          L"DONE. %d failure(s)\n\n", writer_->failures()));
     } else {
       writer_->WriteInfoText(L"DONE\n\n");
     }
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index c54f2d8..390d2aa 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -8,8 +8,9 @@
 
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
-#include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/path_service.h"
@@ -58,7 +59,8 @@ class OperatingSystemTest : public DiagnosticTest {
 #else
     // TODO(port): define the OS criteria for Linux and Mac.
 #endif  // defined(OS_WIN)
-    RecordSuccess(ASCIIToUTF16(StringPrintf("%s %s",
+    RecordSuccess(ASCIIToUTF16(base::StringPrintf(
+        "%s %s",
         base::SysInfo::OperatingSystemName().c_str(),
         base::SysInfo::OperatingSystemVersion().c_str())));
     return true;