diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 20:27:04 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 20:27:04 +0000 |
| commit | 5f0cebb46d66ef0a1996594d0846c0067a8cf475 (patch) | |
| tree | 5b3204961a403e7396fe48b45930b5b6528839f0 /chrome/browser/net/url_fixer_upper_unittest.cc | |
| parent | 20023a76c3ffa049c35f86263fbf6ee4bbf00ade (diff) | |
| download | chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.zip chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.gz chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.bz2 | |
Add utf_string_conversions to base namespace.
This adds "using"s for all functions so those can be fixed in a separate pass.
This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
BUG=
Review URL: https://codereview.chromium.org/12314090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/url_fixer_upper_unittest.cc')
| -rw-r--r-- | chrome/browser/net/url_fixer_upper_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc index 8c6cfc8..b2a13c5 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 |