diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 11:35:46 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 11:35:46 +0000 |
| commit | ce97ca368d06b936720493bc423136a3285d612a (patch) | |
| tree | 44531f194372af7919950a4771d37318f9048302 /net/proxy | |
| parent | ff3b72daaf169c5c009167e250cd8a2db4176d2b (diff) | |
| download | chromium_src-ce97ca368d06b936720493bc423136a3285d612a.zip chromium_src-ce97ca368d06b936720493bc423136a3285d612a.tar.gz chromium_src-ce97ca368d06b936720493bc423136a3285d612a.tar.bz2 | |
Renamed namespaces in src/net.
url_util -> url
url_parse -> url
url_canon -> url
BUG=364747
Review URL: https://codereview.chromium.org/255333003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_bypass_rules.cc | 10 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_android.cc | 7 | ||||
| -rw-r--r-- | net/proxy/proxy_resolver_v8.cc | 7 |
3 files changed, 11 insertions, 13 deletions
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index b902655..e402db8 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -132,11 +132,11 @@ class BypassIPBlockRule : public ProxyBypassRules::Rule { // Returns true if the given string represents an IP address. bool IsIPAddress(const std::string& domain) { // From GURL::HostIsIPAddress() - url_canon::RawCanonOutputT<char, 128> ignored_output; - url_canon::CanonHostInfo host_info; - url_parse::Component domain_comp(0, domain.size()); - url_canon::CanonicalizeIPAddress(domain.c_str(), domain_comp, - &ignored_output, &host_info); + url::RawCanonOutputT<char, 128> ignored_output; + url::CanonHostInfo host_info; + url::Component domain_comp(0, domain.size()); + url::CanonicalizeIPAddress(domain.c_str(), domain_comp, &ignored_output, + &host_info); return host_info.IsIPAddress(); } diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index 25276e8..4129bf2 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -39,10 +39,9 @@ typedef ProxyConfigServiceAndroid::GetPropertyCallback GetPropertyCallback; // Returns whether the provided string was successfully converted to a port. bool ConvertStringToPort(const std::string& port, int* output) { - url_parse::Component component(0, port.size()); - int result = url_parse::ParsePort(port.c_str(), component); - if (result == url_parse::PORT_INVALID || - result == url_parse::PORT_UNSPECIFIED) + url::Component component(0, port.size()); + int result = url::ParsePort(port.c_str(), component); + if (result == url::PORT_INVALID || result == url::PORT_UNSPECIFIED) return false; *output = result; return true; diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 9c9f421..9011875 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -225,10 +225,9 @@ bool GetHostnameArgument(const v8::FunctionCallbackInfo<v8::Value>& args, // Otherwise try to convert it from IDN to punycode. const int kInitialBufferSize = 256; - url_canon::RawCanonOutputT<base::char16, kInitialBufferSize> punycode_output; - if (!url_canon::IDNToASCII(hostname_utf16.data(), - hostname_utf16.length(), - &punycode_output)) { + url::RawCanonOutputT<base::char16, kInitialBufferSize> punycode_output; + if (!url::IDNToASCII(hostname_utf16.data(), hostname_utf16.length(), + &punycode_output)) { return false; } |