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

5 files changed, 12 insertions, 13 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());
 }
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 541836b..1c59ff2 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -42,7 +42,7 @@ namespace webkit_glue {
 
 //---- BEGIN FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE -----------------------------
 
-void SetJavaScriptFlags(const std::wstring& flags);
+void SetJavaScriptFlags(const std::string& flags);
 
 // Turn on the logging for notImplemented() calls from WebCore.
 void EnableWebCoreNotImplementedLogging();
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index df2e439..5f380e1 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -121,7 +121,7 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode)
   SimpleResourceLoaderBridge::Init(FilePath(), cache_mode, true);
 
   // Test shell always exposes the GC.
-  webkit_glue::SetJavaScriptFlags(L" --expose-gc");
+  webkit_glue::SetJavaScriptFlags(" --expose-gc");
   // Expose GCController to JavaScript.
   WebScriptController::registerExtension(extensions_v8::GCExtension::Get());
 }
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 8680af8..09c75bb 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -62,9 +62,9 @@ int main(int argc, char* argv[]) {
 
   // Allow tests to analyze GC information from V8 log, and expose GC
   // triggering function.
-  std::wstring js_flags =
-      parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
-  js_flags += L" --logfile=* --log_gc --expose_gc";
+  std::string js_flags =
+      parsed_command_line.GetSwitchValueASCII(test_shell::kJavaScriptFlags);
+  js_flags += " --logfile=* --log_gc --expose_gc";
   webkit_glue::SetJavaScriptFlags(js_flags);
 
   // Suppress error dialogs and do not show GP fault error box on Windows.
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 8eb549e..f71dc00 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -239,10 +239,10 @@ int main(int argc, char* argv[]) {
     }
   }
 
-  std::wstring js_flags =
-    parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
+  std::string js_flags =
+      parsed_command_line.GetSwitchValueASCII(test_shell::kJavaScriptFlags);
   // Test shell always exposes the GC.
-  js_flags += L" --expose-gc";
+  js_flags += " --expose-gc";
   webkit_glue::SetJavaScriptFlags(js_flags);
   // Expose GCController to JavaScript.
   WebScriptController::registerExtension(extensions_v8::GCExtension::Get());