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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_test_util.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
« net/base/mime_util_unittest.cc ('K') | « net/url_request/url_request_test_util.h ('k') | net/url_request/url_request_throttler_entry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 17ad31166fbe354f317561a2603be267d79ed911..05b66f289cfff21aad6326e3fca95a928a0f94d9 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -87,8 +87,7 @@ void TestURLRequestContext::Init() {
scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
}
if (!transport_security_state()) {
- context_storage_.set_transport_security_state(
- new TransportSecurityState());
+ context_storage_.set_transport_security_state(new TransportSecurityState());
}
if (http_transaction_factory()) {
// Make sure we haven't been passed an object we're not going to use.
@@ -105,9 +104,9 @@ void TestURLRequestContext::Init() {
params.network_delegate = network_delegate();
params.http_server_properties = http_server_properties();
params.net_log = net_log();
- context_storage_.set_http_transaction_factory(new HttpCache(
- new HttpNetworkSession(params),
- HttpCache::DefaultBackend::InMemory(0)));
+ context_storage_.set_http_transaction_factory(
+ new HttpCache(new HttpNetworkSession(params),
+ HttpCache::DefaultBackend::InMemory(0)));
}
// In-memory cookie store.
if (!cookie_store())
@@ -115,9 +114,8 @@ void TestURLRequestContext::Init() {
// In-memory origin bound cert service.
if (!server_bound_cert_service()) {
context_storage_.set_server_bound_cert_service(
- new ServerBoundCertService(
- new DefaultServerBoundCertStore(NULL),
- base::WorkerPool::GetTaskRunner(true)));
+ new ServerBoundCertService(new DefaultServerBoundCertStore(NULL),
+ base::WorkerPool::GetTaskRunner(true)));
}
if (!http_user_agent_settings()) {
context_storage_.set_http_user_agent_settings(
@@ -131,7 +129,8 @@ TestURLRequest::TestURLRequest(const GURL& url,
RequestPriority priority,
Delegate* delegate,
TestURLRequestContext* context)
- : URLRequest(url, priority, delegate, context) {}
+ : URLRequest(url, priority, delegate, context) {
+}
TestURLRequest::~TestURLRequest() {
}
@@ -149,7 +148,8 @@ TestURLRequestContextGetter::TestURLRequestContextGetter(
DCHECK(network_task_runner_.get());
}
-TestURLRequestContextGetter::~TestURLRequestContextGetter() {}
+TestURLRequestContextGetter::~TestURLRequestContextGetter() {
+}
TestURLRequestContext* TestURLRequestContextGetter::GetURLRequestContext() {
if (!context_.get())
@@ -184,7 +184,8 @@ TestDelegate::TestDelegate()
buf_(new IOBuffer(kBufferSize)) {
}
-TestDelegate::~TestDelegate() {}
+TestDelegate::~TestDelegate() {
+}
void TestDelegate::ClearFullRequestHeaders() {
full_request_headers_.Clear();
@@ -330,7 +331,8 @@ TestNetworkDelegate::TestNetworkDelegate()
TestNetworkDelegate::~TestNetworkDelegate() {
for (std::map<int, int>::iterator i = next_states_.begin();
- i != next_states_.end(); ++i) {
+ i != next_states_.end();
+ ++i) {
event_order_[i->first] += "~TestNetworkDelegate\n";
EXPECT_TRUE(i->second & kStageDestruction) << event_order_[i->first];
}
@@ -359,52 +361,45 @@ void TestNetworkDelegate::InitRequestStatesIfNew(int request_id) {
}
}
-int TestNetworkDelegate::OnBeforeURLRequest(
- URLRequest* request,
- const CompletionCallback& callback,
- GURL* new_url ) {
+int TestNetworkDelegate::OnBeforeURLRequest(URLRequest* request,
+ const CompletionCallback& callback,
+ GURL* new_url) {
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnBeforeURLRequest\n";
- EXPECT_TRUE(next_states_[req_id] & kStageBeforeURLRequest) <<
- event_order_[req_id];
+ EXPECT_TRUE(next_states_[req_id] & kStageBeforeURLRequest)
+ << event_order_[req_id];
next_states_[req_id] =
kStageBeforeSendHeaders |
kStageResponseStarted | // data: URLs do not trigger sending headers
- kStageBeforeRedirect | // a delegate can trigger a redirection
- kStageCompletedError | // request canceled by delegate
- kStageAuthRequired; // Auth can come next for FTP requests
+ kStageBeforeRedirect | // a delegate can trigger a redirection
+ kStageCompletedError | // request canceled by delegate
+ kStageAuthRequired; // Auth can come next for FTP requests
created_requests_++;
return OK;
}
-int TestNetworkDelegate::OnBeforeSendHeaders(
- URLRequest* request,
- const CompletionCallback& callback,
- HttpRequestHeaders* headers) {
+int TestNetworkDelegate::OnBeforeSendHeaders(URLRequest* request,
+ const CompletionCallback& callback,
+ HttpRequestHeaders* headers) {
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnBeforeSendHeaders\n";
- EXPECT_TRUE(next_states_[req_id] & kStageBeforeSendHeaders) <<
- event_order_[req_id];
+ EXPECT_TRUE(next_states_[req_id] & kStageBeforeSendHeaders)
+ << event_order_[req_id];
next_states_[req_id] =
- kStageSendHeaders |
- kStageCompletedError; // request canceled by delegate
+ kStageSendHeaders | kStageCompletedError; // request canceled by delegate
return OK;
}
-void TestNetworkDelegate::OnSendHeaders(
- URLRequest* request,
- const HttpRequestHeaders& headers) {
+void TestNetworkDelegate::OnSendHeaders(URLRequest* request,
+ const HttpRequestHeaders& headers) {
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnSendHeaders\n";
- EXPECT_TRUE(next_states_[req_id] & kStageSendHeaders) <<
- event_order_[req_id];
- next_states_[req_id] =
- kStageHeadersReceived |
- kStageCompletedError;
+ EXPECT_TRUE(next_states_[req_id] & kStageSendHeaders) << event_order_[req_id];
+ next_states_[req_id] = kStageHeadersReceived | kStageCompletedError;
}
int TestNetworkDelegate::OnHeadersReceived(
@@ -416,13 +411,11 @@ int TestNetworkDelegate::OnHeadersReceived(
int req_id = request->identifier();
event_order_[req_id] += "OnHeadersReceived\n";
InitRequestStatesIfNew(req_id);
- EXPECT_TRUE(next_states_[req_id] & kStageHeadersReceived) <<
- event_order_[req_id];
- next_states_[req_id] =
- kStageBeforeRedirect |
- kStageResponseStarted |
- kStageAuthRequired |
- kStageCompletedError; // e.g. proxy resolution problem
+ EXPECT_TRUE(next_states_[req_id] & kStageHeadersReceived)
+ << event_order_[req_id];
+ next_states_[req_id] = kStageBeforeRedirect | kStageResponseStarted |
+ kStageAuthRequired |
+ kStageCompletedError; // e.g. proxy resolution problem
// Basic authentication sends a second request from the URLRequestHttpJob
// layer before the URLRequest reports that a response has started.
@@ -433,8 +426,8 @@ int TestNetworkDelegate::OnHeadersReceived(
new net::HttpResponseHeaders(original_response_headers->raw_headers());
(*override_response_headers)->ReplaceStatusLine("HTTP/1.1 302 Found");
(*override_response_headers)->RemoveHeader("Location");
- (*override_response_headers)->AddHeader(
- "Location: " + redirect_on_headers_received_url_.spec());
+ (*override_response_headers)
+ ->AddHeader("Location: " + redirect_on_headers_received_url_.spec());
redirect_on_headers_received_url_ = GURL();
@@ -456,10 +449,10 @@ void TestNetworkDelegate::OnBeforeRedirect(URLRequest* request,
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnBeforeRedirect\n";
- EXPECT_TRUE(next_states_[req_id] & kStageBeforeRedirect) <<
- event_order_[req_id];
+ EXPECT_TRUE(next_states_[req_id] & kStageBeforeRedirect)
+ << event_order_[req_id];
next_states_[req_id] =
- kStageBeforeURLRequest | // HTTP redirects trigger this.
+ kStageBeforeURLRequest | // HTTP redirects trigger this.
kStageBeforeSendHeaders | // Redirects from the network delegate do not
// trigger onBeforeURLRequest.
kStageCompletedError;
@@ -478,8 +471,8 @@ void TestNetworkDelegate::OnResponseStarted(URLRequest* request) {
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnResponseStarted\n";
- EXPECT_TRUE(next_states_[req_id] & kStageResponseStarted) <<
- event_order_[req_id];
+ EXPECT_TRUE(next_states_[req_id] & kStageResponseStarted)
+ << event_order_[req_id];
next_states_[req_id] = kStageCompletedSuccess | kStageCompletedError;
if (request->status().status() == URLRequestStatus::FAILED) {
error_count_++;
@@ -499,11 +492,11 @@ void TestNetworkDelegate::OnCompleted(URLRequest* request, bool started) {
// is logically identical to
// Expect "!(Success) || (next_states_ & kStageCompletedSuccess)"
EXPECT_TRUE(!request->status().is_success() ||
- (next_states_[req_id] & kStageCompletedSuccess)) <<
- event_order_[req_id];
+ (next_states_[req_id] & kStageCompletedSuccess))
+ << event_order_[req_id];
EXPECT_TRUE(request->status().is_success() ||
- (next_states_[req_id] & kStageCompletedError)) <<
- event_order_[req_id];
+ (next_states_[req_id] & kStageCompletedError))
+ << event_order_[req_id];
next_states_[req_id] = kStageURLRequestDestroyed;
completed_requests_++;
if (request->status().status() == URLRequestStatus::FAILED) {
@@ -520,8 +513,8 @@ void TestNetworkDelegate::OnURLRequestDestroyed(URLRequest* request) {
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnURLRequestDestroyed\n";
- EXPECT_TRUE(next_states_[req_id] & kStageURLRequestDestroyed) <<
- event_order_[req_id];
+ EXPECT_TRUE(next_states_[req_id] & kStageURLRequestDestroyed)
+ << event_order_[req_id];
next_states_[req_id] = kStageDestruction;
destroyed_requests_++;
}
@@ -544,9 +537,10 @@ NetworkDelegate::AuthRequiredResponse TestNetworkDelegate::OnAuthRequired(
int req_id = request->identifier();
InitRequestStatesIfNew(req_id);
event_order_[req_id] += "OnAuthRequired\n";
- EXPECT_TRUE(next_states_[req_id] & kStageAuthRequired) <<
- event_order_[req_id];
- next_states_[req_id] = kStageBeforeSendHeaders |
+ EXPECT_TRUE(next_states_[req_id] & kStageAuthRequired)
+ << event_order_[req_id];
+ next_states_[req_id] =
+ kStageBeforeSendHeaders |
kStageAuthRequired | // For example, proxy auth followed by server auth.
kStageHeadersReceived | // Request canceled by delegate simulates empty
// response.
@@ -605,9 +599,8 @@ int TestNetworkDelegate::OnBeforeSocketStreamConnect(
std::string ScopedCustomUrlRequestTestHttpHost::value_("127.0.0.1");
ScopedCustomUrlRequestTestHttpHost::ScopedCustomUrlRequestTestHttpHost(
- const std::string& new_value)
- : old_value_(value_),
- new_value_(new_value) {
+ const std::string& new_value)
+ : old_value_(value_), new_value_(new_value) {
value_ = new_value_;
}
« net/base/mime_util_unittest.cc ('K') | « net/url_request/url_request_test_util.h ('k') | net/url_request/url_request_throttler_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698