Cleanup: Replace base::ASCIIToWide with base::ASCIIToUTF16.

ui/base/clipboard/clipboard_win.cc

 // Copyright (c) 2012 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.
 
 // Many of these functions are based on those found in
 // webkit/port/platform/PasteboardWin.cpp
 
 #include "ui/base/clipboard/clipboard_win.h"
 
 #include <shellapi.h>
@@ skipping 118 matching lines @@
 HGLOBAL CreateGlobalData(const std::basic_string<charT>& str) {
   HGLOBAL data =
     ::GlobalAlloc(GMEM_MOVEABLE, ((str.size() + 1) * sizeof(charT)));
   if (data) {
     charT* raw_data = static_cast<charT*>(::GlobalLock(data));
     memcpy(raw_data, str.data(), str.size() * sizeof(charT));
     raw_data[str.size()] = '\0';
     ::GlobalUnlock(data);
   }
   return data;
-};
+}
 
 bool BitmapHasInvalidPremultipliedColors(const SkBitmap& bitmap) {
   for (int x = 0; x < bitmap.width(); ++x) {
     for (int y = 0; y < bitmap.height(); ++y) {
       uint32_t pixel = *bitmap.getAddr32(x, y);
       if (SkColorGetR(pixel) > SkColorGetA(pixel) ||
           SkColorGetG(pixel) > SkColorGetA(pixel) ||
           SkColorGetB(pixel) > SkColorGetA(pixel))
         return true;
     }
@@ skipping 81 matching lines @@
 
 bool Clipboard::FormatType::Equals(const FormatType& other) const {
   return data_.cfFormat == other.data_.cfFormat;
 }
 
 // Various predefined FormatTypes.
 // static
 Clipboard::FormatType Clipboard::GetFormatType(
     const std::string& format_string) {
   return FormatType(
-      ::RegisterClipboardFormat(base::ASCIIToWide(format_string).c_str()));
+      ::RegisterClipboardFormat(base::ASCIIToUTF16(format_string).c_str()));
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetUrlFormatType() {
   CR_DEFINE_STATIC_LOCAL(
       FormatType, type, (::RegisterClipboardFormat(CFSTR_INETURLA)));
   return type;
 }
 
 // static
@@ skipping 468 matching lines @@
 }
 
 void ClipboardWin::WriteBookmark(const char* title_data,
                                  size_t title_len,
                                  const char* url_data,
                                  size_t url_len) {
   std::string bookmark(title_data, title_len);
   bookmark.append(1, L'\n');
   bookmark.append(url_data, url_len);
 
-  base::string16 wide_bookmark = base::UTF8ToWide(bookmark);
+  base::string16 wide_bookmark = base::UTF8ToUTF16(bookmark);
   HGLOBAL glob = CreateGlobalData(wide_bookmark);
 
   WriteToClipboard(GetUrlWFormatType().ToFormatEtc().cfFormat, glob);
 }
 
 void ClipboardWin::WriteWebSmartPaste() {
   DCHECK(clipboard_owner_->hwnd() != NULL);
   ::SetClipboardData(GetWebKitSmartPasteFormatType().ToFormatEtc().cfFormat,
                      NULL);
 }
@@ skipping 112 matching lines @@
   if (!clipboard_owner_)
     return NULL;
 
   if (clipboard_owner_->hwnd() == NULL)
     clipboard_owner_->Create(base::Bind(&ClipboardOwnerWndProc));
 
   return clipboard_owner_->hwnd();
 }
 
 }  // namespace ui