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

Side by Side Diff: net/base/host_port_pair.cc

Issue 12473004: src/: Update the remaining include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/base/host_mapping_rules.cc ('k') | net/base/host_resolver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/host_port_pair.h" 5 #include "net/base/host_port_pair.h"
6 6
7 #include "base/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/string_split.h"
9 #include "base/string_util.h" 8 #include "base/string_util.h"
10 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/strings/string_split.h"
11 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
12 #include "net/base/ip_endpoint.h" 12 #include "net/base/ip_endpoint.h"
13 13
14 namespace net { 14 namespace net {
15 15
16 HostPortPair::HostPortPair() : port_(0) {} 16 HostPortPair::HostPortPair() : port_(0) {}
17 HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port) 17 HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port)
18 : host_(in_host), port_(in_port) {} 18 : host_(in_host), port_(in_port) {}
19 19
20 // static 20 // static
(...skipping 29 matching lines...) Expand all
50 // Check to see if the host is an IPv6 address. If so, added brackets. 50 // Check to see if the host is an IPv6 address. If so, added brackets.
51 if (host_.find(':') != std::string::npos) { 51 if (host_.find(':') != std::string::npos) {
52 DCHECK_NE(host_[0], '['); 52 DCHECK_NE(host_[0], '[');
53 return base::StringPrintf("[%s]", host_.c_str()); 53 return base::StringPrintf("[%s]", host_.c_str());
54 } 54 }
55 55
56 return host_; 56 return host_;
57 } 57 }
58 58
59 } // namespace net 59 } // namespace net
OLDNEW
« no previous file with comments | « net/base/host_mapping_rules.cc ('k') | net/base/host_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698