Move UTF16ToASCII, remove WideToASCII.

skia/ext/vector_canvas_unittest.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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 236 matching lines @@
       // Make sure the directory exist.
       base::CreateDirectory(test_dir_);
     }
   }
 
   // Returns the fully qualified path of a data file.
   base::FilePath test_file(const base::FilePath::StringType& filename) const {
     // Hack for a quick lowercase. We assume all the test data file names are
     // ASCII.
 #if defined(OS_WIN)
-    std::string tmp = WideToASCII(filename);
+    std::string tmp = base::UTF16ToASCII(filename);
 #else
     std::string tmp(filename);
 #endif
     for (size_t i = 0; i < tmp.size(); ++i)
       tmp[i] = base::ToLowerASCII(tmp[i]);
 
     return test_dir_.AppendASCII(tmp);
   }
 
   // Compares or saves the bitmap currently loaded in the context, depending on
@@ skipping 692 matching lines @@
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
 #endif  // !defined(USE_AURA)
 
 }  // namespace skia