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

Unified Diff: net/base/net_util_unittest.cc

Issue 112963005: Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/net_util_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_unittest.cc
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 5d5137a9cb0824cfb23123d7f88bf275930c98d9..7e4c77eb52d4f242428382b6a5e354e3c379c0f5 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -30,6 +30,9 @@
#include <net/if.h>
#endif // OS_WIN
+using base::ASCIIToUTF16;
+using base::WideToUTF16;
+
namespace net {
namespace {
@@ -493,7 +496,7 @@ std::string DumpIPNumber(const IPAddressNumber& v) {
}
void RunGenerateFileNameTestCase(const GenerateFilenameCase* test_case) {
- std::string default_filename(WideToUTF8(test_case->default_filename));
+ std::string default_filename(base::WideToUTF8(test_case->default_filename));
base::FilePath file_path = GenerateFileName(
GURL(test_case->url), test_case->content_disp_header,
test_case->referrer_charset, test_case->suggested_filename,
@@ -3344,7 +3347,7 @@ TEST(NetUtilTest, GetNetworkList) {
EXPECT_EQ(luid_to_guid(&luid, &guid), NO_ERROR);
LPOLESTR name;
StringFromCLSID(guid, &name);
- EXPECT_STREQ(UTF8ToWide(it->name).c_str(), name);
+ EXPECT_STREQ(base::UTF8ToWide(it->name).c_str(), name);
CoTaskMemFree(name);
continue;
} else {
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/net_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698