Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2824)

Unified Diff: content/test/image_decoder_test.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/image_decoder_test.cc
diff --git a/content/test/image_decoder_test.cc b/content/test/image_decoder_test.cc
index 00341c07670ed1d2e442b78960f60075170b5e8d..7d89e18bbc73c524c40cc4fb0340ceccb4b80ee3 100644
--- a/content/test/image_decoder_test.cc
+++ b/content/test/image_decoder_test.cc
@@ -11,6 +11,7 @@
#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"
@@ -131,7 +132,7 @@ std::vector<base::FilePath> ImageDecoderTest::GetImageFiles() const {
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
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.cc ('k') | device/serial/serial_device_enumerator_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698