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

Unified Diff: net/test/spawned_test_server/base_test_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/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index a781c6e94042288c67e345286861d6ccf3deeb82..4fb5a103305b3a8a2e3332ebe2961377f06de5ad 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -71,7 +71,8 @@ BaseTestServer::SSLOptions::SSLOptions()
tls_intolerant(TLS_INTOLERANT_NONE),
fallback_scsv_enabled(false),
staple_ocsp_response(false),
- enable_npn(false) {}
+ enable_npn(false) {
+}
BaseTestServer::SSLOptions::SSLOptions(
BaseTestServer::SSLOptions::ServerCertificate cert)
@@ -85,9 +86,11 @@ BaseTestServer::SSLOptions::SSLOptions(
tls_intolerant(TLS_INTOLERANT_NONE),
fallback_scsv_enabled(false),
staple_ocsp_response(false),
- enable_npn(false) {}
+ enable_npn(false) {
+}
-BaseTestServer::SSLOptions::~SSLOptions() {}
+BaseTestServer::SSLOptions::~SSLOptions() {
+}
base::FilePath BaseTestServer::SSLOptions::GetCertificateFile() const {
switch (server_certificate) {
@@ -132,9 +135,7 @@ std::string BaseTestServer::SSLOptions::GetOCSPArgument() const {
const char BaseTestServer::kLocalhost[] = "127.0.0.1";
BaseTestServer::BaseTestServer(Type type, const std::string& host)
- : type_(type),
- started_(false),
- log_to_console_(false) {
+ : type_(type), started_(false), log_to_console_(false) {
Init(host);
}
@@ -147,7 +148,8 @@ BaseTestServer::BaseTestServer(Type type, const SSLOptions& ssl_options)
Init(GetHostname(type, ssl_options));
}
-BaseTestServer::~BaseTestServer() {}
+BaseTestServer::~BaseTestServer() {
+}
const HostPortPair& BaseTestServer::host_port_pair() const {
DCHECK(started_);
@@ -214,14 +216,15 @@ GURL BaseTestServer::GetURL(const std::string& path) const {
}
GURL BaseTestServer::GetURLWithUser(const std::string& path,
- const std::string& user) const {
+ const std::string& user) const {
return GURL(GetScheme() + "://" + user + "@" + host_port_pair_.ToString() +
"/" + path);
}
-GURL BaseTestServer::GetURLWithUserAndPassword(const std::string& path,
- const std::string& user,
- const std::string& password) const {
+GURL BaseTestServer::GetURLWithUserAndPassword(
+ const std::string& path,
+ const std::string& user,
+ const std::string& password) const {
return GURL(GetScheme() + "://" + user + ":" + password + "@" +
host_port_pair_.ToString() + "/" + path);
}
@@ -323,7 +326,7 @@ bool BaseTestServer::SetupWhenServerStarted() {
DCHECK(host_port_pair_.port());
if (UsingSSL(type_) && !LoadTestRootCert())
- return false;
+ return false;
started_ = true;
allowed_port_.reset(new ScopedPortException(host_port_pair_.port()));
@@ -375,7 +378,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
std::vector<base::FilePath>::const_iterator it;
for (it = ssl_options_.client_authorities.begin();
- it != ssl_options_.client_authorities.end(); ++it) {
+ it != ssl_options_.client_authorities.end();
+ ++it) {
if (it->IsAbsolute() && !base::PathExists(*it)) {
LOG(ERROR) << "Client authority path " << it->value()
<< " doesn't exist. Can't launch https server.";

Powered by Google App Engine
This is Rietveld 408576698