Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: net/base/host_port_pair.cc

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/host_port_pair.h ('k') | net/base/host_port_pair_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/host_port_pair.cc
diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc
deleted file mode 100644
index 1550c36f616c258da2fd6c76cf996087ee355042..0000000000000000000000000000000000000000
--- a/net/base/host_port_pair.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/base/host_port_pair.h"
-
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
-#include "net/base/ip_endpoint.h"
-#include "net/base/net_util.h"
-#include "url/gurl.h"
-
-namespace net {
-
-HostPortPair::HostPortPair() : port_(0) {}
-HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port)
- : host_(in_host), port_(in_port) {}
-
-// static
-HostPortPair HostPortPair::FromURL(const GURL& url) {
- return HostPortPair(url.HostNoBrackets(),
- static_cast<uint16>(url.EffectiveIntPort()));
-}
-
-// static
-HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) {
- return HostPortPair(ipe.ToStringWithoutPort(), ipe.port());
-}
-
-HostPortPair HostPortPair::FromString(const std::string& str) {
- std::vector<std::string> key_port;
- base::SplitString(str, ':', &key_port);
- if (key_port.size() != 2)
- return HostPortPair();
- int port;
- if (!base::StringToInt(key_port[1], &port))
- return HostPortPair();
- if (!IsPortValid(port))
- return HostPortPair();
- HostPortPair host_port_pair;
- host_port_pair.set_host(key_port[0]);
- host_port_pair.set_port(static_cast<uint16>(port));
- return host_port_pair;
-}
-
-std::string HostPortPair::ToString() const {
- std::string ret(HostForURL());
- ret += ':';
- ret += base::IntToString(port_);
- return ret;
-}
-
-std::string HostPortPair::HostForURL() const {
- // TODO(rtenneti): Add support for |host| to have '\0'.
- if (host_.find('\0') != std::string::npos) {
- std::string host_for_log(host_);
- size_t nullpos;
- while ((nullpos = host_for_log.find('\0')) != std::string::npos) {
- host_for_log.replace(nullpos, 1, "%00");
- }
- LOG(DFATAL) << "Host has a null char: " << host_for_log;
- }
- // Check to see if the host is an IPv6 address. If so, added brackets.
- if (host_.find(':') != std::string::npos) {
- DCHECK_NE(host_[0], '[');
- return base::StringPrintf("[%s]", host_.c_str());
- }
-
- return host_;
-}
-
-} // namespace net
« no previous file with comments | « net/base/host_port_pair.h ('k') | net/base/host_port_pair_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698