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

Unified Diff: chrome/browser/net/url_fixer_upper_unittest.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « chrome/browser/net/url_fixer_upper.cc ('k') | chrome/browser/parsers/metadata_parser_filebase.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/url_fixer_upper_unittest.cc
diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc
index 8c6cfc88a49e732292f61d41401aa76ba4d5ce24..b2a13c5b19e57fb433750c7b30a9f875ac1f95a0 100644
--- a/chrome/browser/net/url_fixer_upper_unittest.cc
+++ b/chrome/browser/net/url_fixer_upper_unittest.cc
@@ -366,7 +366,7 @@ TEST(URLFixerUpperTest, FixupFile) {
// c:\foo\bar.txt -> file:///c:/foo/bar.txt (basic)
#if defined(OS_WIN)
- GURL fixedup(URLFixerUpper::FixupURL(WideToUTF8(original.value()),
+ GURL fixedup(URLFixerUpper::FixupURL(base::WideToUTF8(original.value()),
std::string()));
#elif defined(OS_POSIX)
GURL fixedup(URLFixerUpper::FixupURL(original.value(), std::string()));
@@ -376,7 +376,7 @@ TEST(URLFixerUpperTest, FixupFile) {
// TODO(port): Make some equivalent tests for posix.
#if defined(OS_WIN)
// c|/foo\bar.txt -> file:///c:/foo/bar.txt (pipe allowed instead of colon)
- std::string cur(WideToUTF8(original.value()));
+ std::string cur(base::WideToUTF8(original.value()));
EXPECT_EQ(':', cur[1]);
cur[1] = '|';
EXPECT_EQ(golden, URLFixerUpper::FixupURL(cur, std::string()));
@@ -461,7 +461,7 @@ TEST(URLFixerUpperTest, FixupRelativeFile) {
for (size_t i = 0; i < arraysize(fixup_cases); ++i) {
fixup_case value = fixup_cases[i];
#if defined(OS_WIN)
- base::FilePath input(UTF8ToWide(value.input));
+ base::FilePath input(base::UTF8ToWide(value.input));
#elif defined(OS_POSIX)
base::FilePath input(value.input);
#endif
« no previous file with comments | « chrome/browser/net/url_fixer_upper.cc ('k') | chrome/browser/parsers/metadata_parser_filebase.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698