webkit: use string16 in webkit_glue.h

webkit/tools/test_shell/layout_test_controller.cc

Index: webkit/tools/test_shell/layout_test_controller.cc
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index d344dfa6e6405e407903d2179b1346653b392668..16d7bcdd05d3621a40cfc1350f4adb7c17a4fb4b 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -1334,12 +1334,12 @@ void LayoutTestController::counterValueForElementById(
   result->SetNull();
   if (args.size() < 1 || !args[0].isString())
     return;
-  std::wstring counterValue;
+  string16 counterValue;
   if (!webkit_glue::CounterValueForElementById(shell_->webView()->mainFrame(),
                                                args[0].ToString(),
                                                &counterValue))
     return;
-  result->Set(WideToUTF8(counterValue));
+  result->Set(UTF16ToUTF8(counterValue));
 }
 
 static bool ParsePageSizeParameters(const CppArgumentList& args,