Remove wchar_t versions of StringPrintf from Android

chrome/browser/diagnostics/diagnostics_main.cc

 // Copyright (c) 2012 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/diagnostics/diagnostics_main.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #include <stdio.h>
@@ skipping 197 matching lines @@
 
   // How many tests reported failure.
   int failures() { return failures_; }
 
   // Write an informational line of text in white over black.
   bool WriteInfoText(const std::wstring& txt) {
     console_->SetColor(SimpleConsole::DEFAULT);
     return console_->Write(txt);
   }
 
+  bool WriteInfoText(const std::string& txt) {
+    return WriteInfoText(UTF8ToWide(txt));
+  }
+
   // Write a result block. It consist of two lines. The first line
   // has [PASS] or [FAIL] with |name| and the second line has
   // the text in |extra|.
   bool WriteResult(bool success, const std::wstring& name,
                    const std::wstring& extra) {
     if (success) {
       console_->SetColor(SimpleConsole::GREEN);
       console_->Write(L"[PASS] ");
     } else {
       console_->SetColor(SimpleConsole::RED);
       console_->Write(L"[FAIL] ");
       failures_++;
     }
     WriteInfoText(name + L"\n");
     std::wstring second_line(L"   ");
     second_line.append(extra);
     return WriteInfoText(second_line + L"\n\n");
   }
 
  private:
   SimpleConsole* console_;
 
   // Keeps track of how many tests reported failure.
   int failures_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWriter);
 };
 
-std::wstring PrintableUSCurrentTime() {
+std::string PrintableUSCurrentTime() {
   base::Time::Exploded exploded = {0};
   base::Time::Now().UTCExplode(&exploded);
-  return base::StringPrintf(L"%d:%d:%d.%d:%d:%d",
+  return base::StringPrintf("%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)
 // and the model (DiagnosticsModel) do not talk to each other directly but they
 // are mediated by the controller. This has a name: 'passive view'.
 // More info at http://martinfowler.com/eaaDev/PassiveScreen.html
 class TestController : public DiagnosticsModel::Observer {
  public:
   explicit TestController(TestWriter* writer)
       : model_(NULL),
         writer_(writer) {
   }
 
   // Run all the diagnostics of |model| and invoke the view as the model
   // callbacks arrive.
   void Run(DiagnosticsModel* model) {
-    std::wstring title(L"Chrome Diagnostics Mode (");
-    writer_->WriteInfoText(title.append(PrintableUSCurrentTime()) + L")\n");
+    writer_->WriteInfoText(L"Chrome Diagnostics Mode (");
+    writer_->WriteInfoText(PrintableUSCurrentTime() + ")\n");
     if (!model) {
       writer_->WriteResult(false, L"Diagnostics start", L"model is null");
       return;
     }
     bool icu_result = icu_util::Initialize();
     if (!icu_result) {
       writer_->WriteResult(false, L"Diagnostics start", L"ICU failure");
       return;
     }
     ResourceBundle::InitSharedInstanceWithLocale(std::string(), NULL);
     int count = model->GetTestAvailableCount();
     writer_->WriteInfoText(base::StringPrintf(
-        L"%d available test(s)\n\n", count));
+        "%d available test(s)\n\n", count));
     model->RunAll(this);
   }
 
   // Next four are overridden from DiagnosticsModel::Observer.
   virtual void OnProgress(int id, int percent, DiagnosticsModel* model) {
   }
 
   virtual void OnSkipped(int id, DiagnosticsModel* model) {
     // TODO(cpu): display skipped tests.
   }
 
   virtual void OnFinished(int id, DiagnosticsModel* model) {
     // As each test completes we output the results.
     ShowResult(&model->GetTest(id));
   }
 
   virtual void OnDoneAll(DiagnosticsModel* model) {
     if (writer_->failures() > 0) {
       writer_->WriteInfoText(base::StringPrintf(
-          L"DONE. %d failure(s)\n\n", writer_->failures()));
+          "DONE. %d failure(s)\n\n", writer_->failures()));
     } else {
       writer_->WriteInfoText(L"DONE\n\n");
     }
   }
 
  private:
   void ShowResult(DiagnosticsModel::TestInfo* test_info) {
     bool success = (DiagnosticsModel::TEST_OK == test_info->GetResult());
     writer_->WriteResult(success, UTF16ToWide(test_info->GetTitle()),
                          UTF16ToWide(test_info->GetAdditionalInfo()));
@@ skipping 35 matching lines @@
   TestController controller(&writer);
 
   // Run all the diagnostic tests.
   controller.Run(model);
   delete model;
 
   console->OnQuit();
   delete console;
   return 0;
 }