Revert 184352

chrome/test/chromedriver/key_converter_unittest.cc

 // Copyright (c) 2013 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.
 
 #include <list>
 #include <string>
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/chromedriver/key_converter.h"
@@ skipping 134 matching lines @@
       CreateKeyDownEvent(ui::VKEY_F1, 0),
       CreateKeyUpEvent(ui::VKEY_F1, 0)};
   string16 keys;
   keys.push_back(static_cast<char16>(0xE031U));
   CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
 }
 
 TEST(KeyConverter, FrenchKeyOnEnglishLayout) {
   KeyEvent event_array[] = {
       CreateKeyDownEvent(ui::VKEY_UNKNOWN, 0),
-      CreateCharEvent(base::WideToUTF8(L"\u00E9"),
-                      base::WideToUTF8(L"\u00E9"), 0),
+      CreateCharEvent(WideToUTF8(L"\u00E9"), WideToUTF8(L"\u00E9"), 0),
       CreateKeyUpEvent(ui::VKEY_UNKNOWN, 0)};
-  CheckEventsReleaseModifiers(base::WideToUTF16(L"\u00E9"),
+  CheckEventsReleaseModifiers(WideToUTF16(L"\u00E9"),
       event_array, arraysize(event_array));
 }
 
 #if defined(OS_WIN)
 TEST(KeyConverter, NeedsCtrlAndAlt) {
   RestoreKeyboardLayoutOnDestruct restore;
   int ctrl_and_alt = kControlKeyModifierMask | kAltKeyModifierMask;
   KeyEvent event_array[] = {
       CreateKeyDownEvent(ui::VKEY_CONTROL, 0),
       CreateKeyDownEvent(ui::VKEY_MENU, 0),
@@ skipping 226 matching lines @@
           kShiftKeyModifierMask | kControlKeyModifierMask),
       CreateKeyUpEvent(ui::VKEY_SHIFT, 0),
       CreateKeyUpEvent(ui::VKEY_CONTROL, 0)};
   string16 keys;
   keys.push_back(static_cast<char16>(0xE008U));
   keys.push_back(static_cast<char16>(0xE009U));
 
   CheckEvents(keys, event_array, true /* release_modifiers */,
       arraysize(event_array), 0);
 }