Remove some wstrings used in ui_test.cc.

This removes all switch-related wstring APIs from ui_test.cc, and
fixes all the callers.

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

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

1 files changed, 4 insertions, 5 deletions

diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index e6b0f75..f6fadfe 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -74,11 +74,9 @@ namespace webkit_glue {
 // Global variable used by the plugin quirk "die after unload".
 bool g_forcefully_terminate_plugin_process = false;
 
-void SetJavaScriptFlags(const std::wstring& str) {
+void SetJavaScriptFlags(const std::string& str) {
 #if WEBKIT_USING_V8
-  std::string utf8_str = WideToUTF8(str);
-  v8::V8::SetFlagsFromString(
-      utf8_str.data(), static_cast<int>(utf8_str.size()));
+  v8::V8::SetFlagsFromString(str.data(), static_cast<int>(str.size()));
 #endif
 }
 
@@ -257,7 +255,8 @@ void ResetBeforeTestRun(WebView* view) {
 #ifndef NDEBUG
 // The log macro was having problems due to collisions with WTF, so we just
 // code here what that would have inlined.
-void DumpLeakedObject(const char* file, int line, const char* object, int count) {
+void DumpLeakedObject(const char* file, int line, const char* object,
+                      int count) {
   std::string msg = StringPrintf("%s LEAKED %d TIMES", object, count);
   AppendToLog(file, line, msg.c_str());
 }