Move UTF16ToASCII, remove WideToASCII.

content/test/image_decoder_test.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.
 
 #include "content/test/image_decoder_test.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebImageDecoder.h"
 
 using base::Time;
 
 namespace {
 
 const int kFirstFrameIndex = 0;
@@ skipping 100 matching lines @@
 
   base::FileEnumerator enumerator(data_dir_,
                                   false,
                                   base::FileEnumerator::FILES);
 
   std::vector<base::FilePath> image_files;
   base::FilePath next_file_name;
   while (!(next_file_name = enumerator.Next()).empty()) {
     base::FilePath base_name = next_file_name.BaseName();
 #if defined(OS_WIN)
-    std::string base_name_ascii = WideToASCII(base_name.value());
+    std::string base_name_ascii = base::UTF16ToASCII(base_name.value());
 #else
     std::string base_name_ascii = base_name.value();
 #endif
     if (!MatchPattern(base_name_ascii, pattern))
       continue;
     image_files.push_back(next_file_name);
   }
 
   return image_files;
 }
@@ skipping 72 matching lines @@
   // Since WebImage does not expose get data by frame, get the size
   // through decoder and pass it to fromData so that the closest
   // image dats to the size is returned.
   blink::WebSize size(decoder->getImage(desired_frame_index).size());
   const blink::WebImage& image = blink::WebImage::fromData(data, size);
   SaveMD5Sum(md5_sum_path, image);
 #else
   VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
 }