diff options
| -rw-r--r-- | url/gurl.cc | 19 | ||||
| -rw-r--r-- | url/gurl.h | 14 |
2 files changed, 4 insertions, 29 deletions
diff --git a/url/gurl.cc b/url/gurl.cc index 52aad73..0137de6 100644 --- a/url/gurl.cc +++ b/url/gurl.cc @@ -194,17 +194,8 @@ bool GURL::operator>(const GURL& other) const { return spec_ > other.spec_; } -GURL GURL::Resolve(const std::string& relative) const { - return ResolveWithCharsetConverter(relative, NULL); -} -GURL GURL::Resolve(const base::string16& relative) const { - return ResolveWithCharsetConverter(relative, NULL); -} - // Note: code duplicated below (it's inconvenient to use a template here). -GURL GURL::ResolveWithCharsetConverter( - const std::string& relative, - url::CharsetConverter* charset_converter) const { +GURL GURL::Resolve(const std::string& relative) const { // Not allowed for invalid URLs. if (!is_valid_) return GURL(); @@ -219,7 +210,7 @@ GURL GURL::ResolveWithCharsetConverter( if (!url::ResolveRelative(spec_.data(), static_cast<int>(spec_.length()), parsed_, relative.data(), static_cast<int>(relative.length()), - charset_converter, &output, &result.parsed_)) { + nullptr, &output, &result.parsed_)) { // Error resolving, return an empty URL. return GURL(); } @@ -235,9 +226,7 @@ GURL GURL::ResolveWithCharsetConverter( } // Note: code duplicated above (it's inconvenient to use a template here). -GURL GURL::ResolveWithCharsetConverter( - const base::string16& relative, - url::CharsetConverter* charset_converter) const { +GURL GURL::Resolve(const base::string16& relative) const { // Not allowed for invalid URLs. if (!is_valid_) return GURL(); @@ -252,7 +241,7 @@ GURL GURL::ResolveWithCharsetConverter( if (!url::ResolveRelative(spec_.data(), static_cast<int>(spec_.length()), parsed_, relative.data(), static_cast<int>(relative.length()), - charset_converter, &output, &result.parsed_)) { + nullptr, &output, &result.parsed_)) { // Error resolving, return an empty URL. return GURL(); } @@ -137,20 +137,6 @@ class URL_EXPORT GURL { GURL Resolve(const std::string& relative) const; GURL Resolve(const base::string16& relative) const; - // Like Resolve() above but takes a character set encoder which will be used - // for any query text specified in the input. The charset converter parameter - // may be NULL, in which case it will be treated as UTF-8. - // - // TODO(brettw): These should be replaced with versions that take something - // more friendly than a raw CharsetConverter (maybe like an ICU character set - // name). - GURL ResolveWithCharsetConverter( - const std::string& relative, - url::CharsetConverter* charset_converter) const; - GURL ResolveWithCharsetConverter( - const base::string16& relative, - url::CharsetConverter* charset_converter) const; - // Creates a new GURL by replacing the current URL's components with the // supplied versions. See the Replacements class in url_canon.h for more. // |