From b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 15 Nov 2011 14:58:21 +0000 Subject: net: Move UnescapeRule into the net namespace. BUG=64263 TEST=None R=willchan@chromium.org Review URL: http://codereview.chromium.org/8552002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110085 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/net/url_fixer_upper.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/net/url_fixer_upper.cc') diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 486556b..2e025fc 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -173,7 +173,7 @@ static std::string FixupPath(const std::string& text) { GURL file_url = net::FilePathToFileURL(FilePath(filename)); if (file_url.is_valid()) { return UTF16ToUTF8(net::FormatUrl(file_url, std::string(), - net::kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL, + net::kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL, NULL, NULL, NULL)); } @@ -550,11 +550,11 @@ GURL URLFixerUpper::FixupRelativeFile(const FilePath& base_dir, #if defined(OS_WIN) std::wstring unescaped = UTF8ToWide(net::UnescapeURLComponent( WideToUTF8(trimmed), - UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS)); + net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS)); #elif defined(OS_POSIX) std::string unescaped = net::UnescapeURLComponent( trimmed, - UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS); + net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS); #endif if (!ValidPathForFile(unescaped, &full_path)) @@ -569,7 +569,7 @@ GURL URLFixerUpper::FixupRelativeFile(const FilePath& base_dir, GURL file_url = net::FilePathToFileURL(full_path); if (file_url.is_valid()) return GURL(UTF16ToUTF8(net::FormatUrl(file_url, std::string(), - net::kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL, + net::kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL, NULL, NULL, NULL))); // Invalid files fall through to regular processing. } -- cgit v1.1