Remove use of wide characters in stats table identifiers.

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


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

3 files changed, 7 insertions, 7 deletions

diff --git a/webkit/tools/test_shell/mac/main.mm b/webkit/tools/test_shell/mac/main.mm
index a3dbeb8..9dd39be 100644
--- a/webkit/tools/test_shell/mac/main.mm
+++ b/webkit/tools/test_shell/mac/main.mm
@@ -27,7 +27,7 @@
 
 static char g_currentTestName[PATH_MAX];
 
-static const wchar_t* kStatsFile = L"testshell";
+static const char* kStatsFile = "testshell";
 static int kStatsFileThreads = 20;
 static int kStatsFileCounters = 100;
 
@@ -164,8 +164,8 @@ int main(const int argc, const char *argv[]) {
 
   // Load and initialize the stats table (one per process, so that multiple
   // instances don't interfere with each other)
-  wchar_t statsfile[64];
-  swprintf(statsfile, 64, L"%ls-%d", kStatsFile, getpid());
+  char statsfile[64];
+  snprintf(statsfile, 64, "%s-%d", kStatsFile, getpid());
   StatsTable *table = 
       new StatsTable(statsfile, kStatsFileThreads, kStatsFileCounters);
   StatsTable::set_current(table);
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index ed88267..523bd83 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -138,10 +138,10 @@ TestShell::~TestShell() {
       if (table != NULL) {
           int counter_max = table->GetMaxCounters();
           for (int index=0; index < counter_max; index++) {
-              std::wstring name(table->GetRowName(index));
+              std::string name(table->GetRowName(index));
               if (name.length() > 0) {
                   int value = table->GetRowValue(index);
-                  printf("%s:\t%d\n", WideToUTF8(name).c_str(), value);
+                  printf("%s:\t%d\n", name.c_str(), value);
               }
           }
       }
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 91a9567..9d619ef 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -54,7 +54,7 @@ static const size_t kPathBufSize = 2048;
 namespace {
 
 // StatsTable initialization parameters.
-static const wchar_t* kStatsFilePrefix = L"testshell_";
+static const char* kStatsFilePrefix = "testshell_";
 static int kStatsFileThreads = 20;
 static int kStatsFileCounters = 200;
 
@@ -233,7 +233,7 @@ int main(int argc, char* argv[]) {
   // Load and initialize the stats table.  Attempt to construct a somewhat
   // unique name to isolate separate instances from each other.
   StatsTable *table = new StatsTable(
-      kStatsFilePrefix + Uint64ToWString(base::RandUint64()),
+      kStatsFilePrefix + Uint64ToString(base::RandUint64()),
       kStatsFileThreads,
       kStatsFileCounters);
   StatsTable::set_current(table);