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

Unified Diff: net/proxy/proxy_server.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: net/proxy/proxy_server.cc
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
index b0997e0a0fa8ec31d0fbc06f55bebdc2f27ce035..4d16def55f738d6e5f2c2f12e1d0aa0cb5d93f1a 100644
--- a/net/proxy/proxy_server.cc
+++ b/net/proxy/proxy_server.cc
@@ -75,7 +75,7 @@ std::string HostNoBrackets(const std::string& host) {
} // namespace
ProxyServer::ProxyServer(Scheme scheme, const HostPortPair& host_port_pair)
- : scheme_(scheme), host_port_pair_(host_port_pair) {
+ : scheme_(scheme), host_port_pair_(host_port_pair) {
if (scheme_ == SCHEME_DIRECT || scheme_ == SCHEME_INVALID) {
// |host_port_pair| isn't relevant for these special schemes, so none should
// have been specified. It is important for this to be consistent since we
@@ -110,9 +110,7 @@ ProxyServer ProxyServer::FromURI(std::string::const_iterator begin,
// Check for [<scheme> "://"]
std::string::const_iterator colon = std::find(begin, end, ':');
- if (colon != end &&
- (end - colon) >= 3 &&
- *(colon + 1) == '/' &&
+ if (colon != end && (end - colon) >= 3 && *(colon + 1) == '/' &&
*(colon + 2) == '/') {
scheme = GetSchemeFromURIInternal(begin, colon);
begin = colon + 3; // Skip past the "://"
@@ -175,7 +173,7 @@ ProxyServer ProxyServer::FromPacString(std::string::const_iterator begin,
}
std::string ProxyServer::ToPacString() const {
- switch (scheme_) {
+ switch (scheme_) {
case SCHEME_DIRECT:
return "DIRECT";
case SCHEME_HTTP:
@@ -222,13 +220,14 @@ ProxyServer::Scheme ProxyServer::GetSchemeFromURI(const std::string& scheme) {
// TODO(bengr): Use |scheme_| to indicate that this is the data reduction proxy.
#if defined(SPDY_PROXY_AUTH_ORIGIN)
bool ProxyServer::isDataReductionProxy() const {
- bool dev_host = false;
-#if defined (DATA_REDUCTION_DEV_HOST)
- dev_host = host_port_pair_.Equals(
- HostPortPair::FromURL(GURL(DATA_REDUCTION_DEV_HOST)));
+ bool dev_host = false;
+#if defined(DATA_REDUCTION_DEV_HOST)
+ dev_host = host_port_pair_.Equals(
+ HostPortPair::FromURL(GURL(DATA_REDUCTION_DEV_HOST)));
#endif
- return dev_host || host_port_pair_.Equals(
- HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)));
+ return dev_host ||
+ host_port_pair_.Equals(
+ HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)));
}
bool ProxyServer::isDataReductionProxyFallback() const {
@@ -245,7 +244,6 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(
Scheme scheme,
std::string::const_iterator begin,
std::string::const_iterator end) {
-
// Trim leading/trailing space.
HttpUtil::TrimLWS(&begin, &end);

Powered by Google App Engine
This is Rietveld 408576698