wstrings: convert CppVariant and CppBoundClass to not use wstring

webkit/tools/test_shell/event_sending_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the definition for EventSendingController.
 //
 // Some notes about drag and drop handling:
 // Windows drag and drop goes through a system call to DoDragDrop.  At that
 // point, program control is given to Windows which then periodically makes
 // callbacks into the webview.  This won't work for layout tests, so instead,
@@ skipping 131 matching lines @@
   e->modifiers = 0;
   e->x = pos.x();
   e->y = pos.y();
   e->globalX = pos.x();
   e->globalY = pos.y();
   e->timeStampSeconds = GetCurrentEventTimeSec();
   e->clickCount = click_count;
 }
 
 // Returns true if the specified key is the system key.
-bool ApplyKeyModifier(const std::wstring& arg, WebInputEvent* event) {
+bool ApplyKeyModifier(const std::string& key, WebInputEvent* event) {
   bool system_key = false;
-  const wchar_t* arg_string = arg.c_str();
-  if (!wcscmp(arg_string, L"ctrlKey")
+  if (key == "ctrlKey"
 #if !defined(OS_MACOSX)
-      || !wcscmp(arg_string, L"addSelectionKey")
+      || key == "addSelectionKey"
 #endif
       ) {
     event->modifiers |= WebInputEvent::ControlKey;
-  } else if (!wcscmp(arg_string, L"shiftKey")
-      || !wcscmp(arg_string, L"rangeSelectionKey")) {
+  } else if (key == "shiftKey"

[viettrungluu, 2010/12/03 02:00:16]

Nit: reformat with standard style?

+      || key == "rangeSelectionKey") {
     event->modifiers |= WebInputEvent::ShiftKey;
-  } else if (!wcscmp(arg_string, L"altKey")) {
+  } else if (key == "altKey") {
     event->modifiers |= WebInputEvent::AltKey;
 #if !defined(OS_MACOSX)
     // On Windows all keys with Alt modifier will be marked as system key.
     // We keep the same behavior on Linux and everywhere non-Mac, see:
     // third_party/WebKit/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
     // If we want to change this behavior on Linux, this piece of code must be
     // kept in sync with the related code in above file.
     system_key = true;
 #endif
 #if defined(OS_MACOSX)
-  } else if (!wcscmp(arg_string, L"metaKey")
-      || !wcscmp(arg_string, L"addSelectionKey")) {
+  } else if (key == "metaKey"

[viettrungluu, 2010/12/03 02:00:16]

"

+      || key == "addSelectionKey") {
     event->modifiers |= WebInputEvent::MetaKey;
     // On Mac only command key presses are marked as system key.
     // See the related code in:
     // third_party/WebKit/WebKit/chromium/src/mac/WebInputEventFactory.cpp
     // It must be kept in sync with the related code in above file.
     system_key = true;
 #else
-  } else if (!wcscmp(arg_string, L"metaKey")) {
+  } else if (key == "metaKey") {
     event->modifiers |= WebInputEvent::MetaKey;
 #endif
   }
   return system_key;
 }
 
 bool ApplyKeyModifiers(const CppVariant* arg, WebInputEvent* event) {
   bool system_key = false;
   if (arg->isObject()) {
-    std::vector<std::wstring> args = arg->ToStringVector();
-    for (std::vector<std::wstring>::const_iterator i = args.begin();
+    std::vector<std::string> args = arg->ToStringVector();
+    for (std::vector<std::string>::const_iterator i = args.begin();
          i != args.end(); ++i) {
       system_key |= ApplyKeyModifier(*i, event);
     }
   } else if (arg->isString()) {
-    system_key = ApplyKeyModifier(UTF8ToWide(arg->ToString()), event);
+    system_key = ApplyKeyModifier(arg->ToString(), event);
   }
   return system_key;
 }
 
 // Get the edit command corresponding to a keyboard event.
 // Returns true if the specified event corresponds to an edit command, the name
 // of the edit command will be stored in |*name|.
 bool GetEditCommand(const WebKeyboardEvent& event, std::string* name) {
 #if defined(OS_MACOSX)
   // We only cares about Left,Right,Up,Down keys with Command or Command+Shift
@@ skipping 645 matching lines @@
       method_factory_.NewRunnableMethod(&EventSendingController::mouseDown,
                                         args, static_cast<CppVariant*>(NULL)));
   MessageLoop::current()->PostTask(FROM_HERE,
       method_factory_.NewRunnableMethod(&EventSendingController::mouseUp,
                                         args, static_cast<CppVariant*>(NULL)));
 }
 
 void EventSendingController::beginDragWithFiles(
     const CppArgumentList& args, CppVariant* result) {
   current_drag_data.initialize();
-  std::vector<std::wstring> files = args[0].ToStringVector();
+  std::vector<std::string> files = args[0].ToStringVector();
   for (size_t i = 0; i < files.size(); ++i) {
-    FilePath file_path = FilePath::FromWStringHack(files[i]);
+    std::wstring file = UTF8ToWide(files[i]);
+    FilePath file_path = FilePath::FromWStringHack(file);
     file_util::AbsolutePath(&file_path);
     current_drag_data.appendToFilenames(
         webkit_glue::FilePathStringToWebString(file_path.value()));
   }
   current_drag_effects_allowed = WebKit::WebDragOperationCopy;
 
   // Provide a drag source.
   WebPoint client_point(last_mouse_pos_.x(), last_mouse_pos_.y());
   WebPoint screen_point(last_mouse_pos_.x(), last_mouse_pos_.y());
   webview()->dragTargetDragEnter(
@@ skipping 193 matching lines @@
 
 void EventSendingController::fireKeyboardEventsToElement(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }
 
 void EventSendingController::clearKillRing(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }