4 files changed, 9 insertions, 15 deletions
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc
index 9745a76..515e2e8 100644
--- a/webkit/glue/chromium_bridge_impl.cc
+++ b/webkit/glue/chromium_bridge_impl.cc
@@ -445,22 +445,17 @@ void ChromiumBridge::stopSharedTimer() {
 
 // StatsCounters --------------------------------------------------------------
 
-void ChromiumBridge::decrementStatsCounter(const char* name) {
+void ChromiumBridge::decrementStatsCounter(const wchar_t* name) {
   StatsCounter(name).Decrement();
 }
 
-void ChromiumBridge::incrementStatsCounter(const char* name) {
+void ChromiumBridge::incrementStatsCounter(const wchar_t* name) {
   StatsCounter(name).Increment();
 }
 
 #if USE(V8)
-// TODO(evanm): remove this conversion thunk once v8 supports plain char*
-// counter functions.
-static int* CounterFunction(const wchar_t* name) {
-  return StatsTable::FindLocation(WideToASCII(name).c_str());
-}
 void ChromiumBridge::initV8CounterFunction() {
-  v8::V8::SetCounterFunction(CounterFunction);
+  v8::V8::SetCounterFunction(StatsTable::FindLocation);
 }
 #endif
 
diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc
index 96296dc..c79d2cf 100644
--- a/webkit/glue/plugins/plugin_lib.cc
+++ b/webkit/glue/plugins/plugin_lib.cc
@@ -29,8 +29,8 @@
 namespace NPAPI
 {
 
-const char kPluginLibrariesLoadedCounter[] = "PluginLibrariesLoaded";
-const char kPluginInstancesActiveCounter[] = "PluginInstancesActive";
+const wchar_t kPluginLibrariesLoadedCounter[] = L"PluginLibrariesLoaded";
+const wchar_t kPluginInstancesActiveCounter[] = L"PluginInstancesActive";
 
 PluginLib::PluginMap* PluginLib::loaded_libs_;
 
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc
index 75218f6..fd31ab7 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl.cc
@@ -22,7 +22,7 @@
 #include "webkit/glue/plugins/plugin_stream_url.h"
 #include "webkit/glue/webkit_glue.h"
 
-static StatsCounter windowless_queue("Plugin.ThrottleQueue");
+static StatsCounter windowless_queue(L"Plugin.ThrottleQueue");
 
 static const wchar_t kNativeWindowClassName[] = L"NativeWindowClass";
 static const wchar_t kWebPluginDelegateProperty[] =
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index a5a8fda..4ee45f9 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -183,8 +183,7 @@ using WebCore::XPathResult;
 // once we figure out how to make tickmark support work again!
 static const size_t kNoTickmark = size_t(-1);
 
-// Key for a StatsCounter tracking how many WebFrames are active.
-static const char* const kWebFrameActiveCount = "WebFrameActiveCount";
+static const wchar_t* const kWebFrameActiveCount = L"WebFrameActiveCount";
 
 static const char* const kOSDType = "application/opensearchdescription+xml";
 static const char* const kOSDRel = "search";
@@ -488,7 +487,7 @@ bool WebFrameImpl::GetPreviousState(GURL* url, std::wstring* title,
   if (!item)
     return false;
 
-  static StatsCounterTimer history_timer("GetHistoryTimer");
+  static StatsCounterTimer history_timer(L"GetHistoryTimer");
   StatsScope<StatsCounterTimer> history_scope(history_timer);
 
   webkit_glue::HistoryItemToString(item, history_state);
@@ -1475,7 +1474,7 @@ void WebFrameImpl::Layout() {
 }
 
 void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
-  static StatsRate rendering("WebFramePaintTime");
+  static StatsRate rendering(L"WebFramePaintTime");
   StatsScope<StatsRate> rendering_scope(rendering);
 
   if (!rect.IsEmpty()) {