summaryrefslogtreecommitdiffstats
path: root/net/base/net_util.h
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-14 22:34:38 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-14 22:34:38 +0000
commit1679811fce07aa4e59efa031cd81d4e10f956156 (patch)
tree093ac47ed6734b7c1735d943365efcf8f5dc2f9e /net/base/net_util.h
parent9c481073c165ce98f419bd81319465d1572c0db2 (diff)
downloadchromium_src-1679811fce07aa4e59efa031cd81d4e10f956156.zip
chromium_src-1679811fce07aa4e59efa031cd81d4e10f956156.tar.gz
chromium_src-1679811fce07aa4e59efa031cd81d4e10f956156.tar.bz2
Cleanup: Fix style errors and remove unused #includes in net/base/net_util.h, and fix missing #includes elsewhere as a result.
Review URL: https://codereview.chromium.org/25183003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.h')
-rw-r--r--net/base/net_util.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/base/net_util.h b/net/base/net_util.h
index 02e79b2..d137fe5 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -15,8 +15,6 @@
#include <sys/socket.h>
#endif
-#include <list>
-#include <set>
#include <string>
#include <vector>
@@ -175,8 +173,8 @@ NET_EXPORT std::string GetHostName();
// Extracts the unescaped username/password from |url|, saving the results
// into |*username| and |*password|.
NET_EXPORT_PRIVATE void GetIdentityFromURL(const GURL& url,
- base::string16* username,
- base::string16* password);
+ base::string16* username,
+ base::string16* password);
// Returns either the host from |url|, or, if the host is empty, the full spec.
NET_EXPORT std::string GetHostOrSpecFromURL(const GURL& url);
@@ -203,7 +201,7 @@ NET_EXPORT std::string GetSpecificHeader(const std::string& headers,
// script-language pairs (currently Han, Kana and Hangul for zh,ja and ko).
// When |languages| is empty, even that mixing is not allowed.
NET_EXPORT base::string16 IDNToUnicode(const std::string& host,
- const std::string& languages);
+ const std::string& languages);
// Canonicalizes |host| and returns it. Also fills |host_info| with
// IP address information. |host_info| must not be NULL.
@@ -430,7 +428,7 @@ NET_EXPORT void SetExplicitlyAllowedPorts(const std::string& allowed_ports);
class NET_EXPORT ScopedPortException {
public:
- ScopedPortException(int port);
+ explicit ScopedPortException(int port);
~ScopedPortException();
private: