summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_cache.cc4
-rw-r--r--net/http/http_cache_unittest.cc6
-rw-r--r--net/http/http_chunked_decoder_unittest.cc5
-rw-r--r--net/http/http_response_headers.h4
-rw-r--r--net/http/http_response_headers_unittest.cc6
5 files changed, 15 insertions, 10 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 913dc00..75f0256 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -320,7 +320,8 @@ class HttpCache::Transaction
uint64 final_upload_progress_;
CompletionCallbackImpl<Transaction> network_info_callback_;
CompletionCallbackImpl<Transaction> network_read_callback_;
- scoped_refptr<CancelableCompletionCallback<Transaction> > cache_read_callback_;
+ scoped_refptr<CancelableCompletionCallback<Transaction> >
+ cache_read_callback_;
};
HttpCache::Transaction::~Transaction() {
@@ -1458,4 +1459,3 @@ void HttpCache::OnProcessPendingQueue(ActiveEntry* entry) {
//-----------------------------------------------------------------------------
} // namespace net
-
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 5db229b..92980e1 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -820,7 +820,8 @@ static void ETagGet_ConditionalRequest_Handler(
std::string* response_status,
std::string* response_headers,
std::string* response_data) {
- EXPECT_TRUE(request->extra_headers.find("If-None-Match") != std::string::npos);
+ EXPECT_TRUE(request->extra_headers.find("If-None-Match") !=
+ std::string::npos);
response_status->assign("HTTP/1.1 304 Not Modified");
response_headers->assign(kETagGET_Transaction.response_headers);
response_data->clear();
@@ -957,7 +958,8 @@ TEST(HttpCache, RangeGET_SkipsCache) {
EXPECT_EQ(0, cache.disk_cache()->open_count());
EXPECT_EQ(0, cache.disk_cache()->create_count());
- transaction.request_headers = "If-Modified-Since: Wed, 28 Nov 2007 00:45:20 GMT";
+ transaction.request_headers =
+ "If-Modified-Since: Wed, 28 Nov 2007 00:45:20 GMT";
RunTransactionTest(cache.http_cache(), transaction);
EXPECT_EQ(3, cache.network_layer()->transaction_count());
diff --git a/net/http/http_chunked_decoder_unittest.cc b/net/http/http_chunked_decoder_unittest.cc
index c8b4f9f..51fbba0 100644
--- a/net/http/http_chunked_decoder_unittest.cc
+++ b/net/http/http_chunked_decoder_unittest.cc
@@ -32,7 +32,9 @@ void RunTest(const char* inputs[], size_t num_inputs,
}
// Feed the inputs to the decoder, until it returns an error.
-void RunTestUntilFailure(const char* inputs[], size_t num_inputs, size_t fail_index) {
+void RunTestUntilFailure(const char* inputs[],
+ size_t num_inputs,
+ size_t fail_index) {
net::HttpChunkedDecoder decoder;
EXPECT_FALSE(decoder.reached_eof());
@@ -264,4 +266,3 @@ TEST(HttpChunkedDecoderTest, InvalidConsecutiveCRLFs) {
};
RunTestUntilFailure(inputs, arraysize(inputs), 1);
}
-
diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h
index 4158d79..918c293 100644
--- a/net/http/http_response_headers.h
+++ b/net/http/http_response_headers.h
@@ -226,8 +226,8 @@ class HttpResponseHeaders :
std::string::const_iterator line_end);
// Tries to extract the status line from a header block, given the first
- // line of said header block. If the status line is malformed, we'll construct
- // a valid one. Example input:
+ // line of said header block. If the status line is malformed, we'll
+ // construct a valid one. Example input:
// HTTP/1.1 200 OK
// with line_begin and end pointing at the begin and end of this line.
// Output will be a normalized version of this, with a trailing \n.
diff --git a/net/http/http_response_headers_unittest.cc b/net/http/http_response_headers_unittest.cc
index 9c7ce75..ef7d8dc 100644
--- a/net/http/http_response_headers_unittest.cc
+++ b/net/http/http_response_headers_unittest.cc
@@ -636,7 +636,8 @@ TEST(HttpResponseHeadersTest, GetMimeType) {
for (size_t i = 0; i < arraysize(tests); ++i) {
string headers(tests[i].raw_headers);
HeadersToRaw(&headers);
- scoped_refptr<HttpResponseHeaders> parsed = new HttpResponseHeaders(headers);
+ scoped_refptr<HttpResponseHeaders> parsed =
+ new HttpResponseHeaders(headers);
std::string value;
EXPECT_EQ(tests[i].has_mimetype, parsed->GetMimeType(&value));
@@ -762,7 +763,8 @@ TEST(HttpResponseHeadersTest, RequiresValidation) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
string headers(tests[i].headers);
HeadersToRaw(&headers);
- scoped_refptr<HttpResponseHeaders> parsed = new HttpResponseHeaders(headers);
+ scoped_refptr<HttpResponseHeaders> parsed =
+ new HttpResponseHeaders(headers);
bool requires_validation =
parsed->RequiresValidation(request_time, response_time, current_time);