webkit: use string16 in webkit_glue.h

webkit/tools/test_shell/layout_test_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 LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
@@ skipping 1316 matching lines @@
     std::string new_locale = args[0].ToString();
     setlocale(LC_ALL, new_locale.c_str());
   }
 }
 
 void LayoutTestController::counterValueForElementById(
     const CppArgumentList& args, CppVariant* result) {
   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,
                                     int arg_offset,
                                     float* page_width_in_pixels,
                                     float* page_height_in_pixels) {
   // WebKit is using the window width/height of DumpRenderTree as the
   // default value of the page size.
   // TODO(hamaji): Once chromium DumpRenderTree is implemented,
   //               share these values with other ports.
@@ skipping 187 matching lines @@
   shell_->device_orientation_client_mock()->setOrientation(orientation);
 }
 
 void LayoutTestController::hasSpellingMarker(const CppArgumentList& arguments,
                                              CppVariant* result) {
   if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
     return;
   result->Set(shell_->webView()->mainFrame()->selectionStartHasSpellingMarkerFor(
       arguments[0].ToInt32(), arguments[1].ToInt32()));
 }