summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc6
-rw-r--r--net/spdy/spdy_network_transaction_unittest.cc8
-rw-r--r--net/url_request/url_request_ftp_job_unittest.cc2
-rw-r--r--net/url_request/url_request_http_job.cc4
-rw-r--r--net/url_request/url_request_http_job_unittest.cc2
-rw-r--r--net/websockets/websocket_handshake_stream_create_helper_test.cc2
-rw-r--r--net/websockets/websocket_stream_test.cc6
-rw-r--r--net/websockets/websocket_test_util.cc2
8 files changed, 16 insertions, 16 deletions
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc
index d54aa86..ac5dab5 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc
@@ -136,7 +136,7 @@ class DataReductionProxyProtocolTest : public testing::Test {
"Host: www.google.com\r\n"
"Proxy-Connection: keep-alive\r\n%s"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n\r\n",
+ "Accept-Encoding: gzip, deflate\r\n\r\n",
method, trailer.c_str());
MockWrite data_writes[] = {
MockWrite(request1.c_str()),
@@ -156,7 +156,7 @@ class DataReductionProxyProtocolTest : public testing::Test {
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n%s"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n\r\n",
+ "Accept-Encoding: gzip, deflate\r\n\r\n",
method, trailer.c_str());
MockWrite data_writes2[] = {
MockWrite(request2.c_str()),
@@ -737,7 +737,7 @@ TEST_F(DataReductionProxyProtocolTest,
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n\r\n"),
+ "Accept-Encoding: gzip, deflate\r\n\r\n"),
};
StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 2cd0ec1..59a2f1b 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -2439,11 +2439,11 @@ TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) {
scoped_ptr<SpdyHeaderBlock> headers(
spdy_util_.ConstructGetHeaderBlock("http://www.google.com/"));
(*headers)["user-agent"] = "";
- (*headers)["accept-encoding"] = "gzip,deflate";
+ (*headers)["accept-encoding"] = "gzip, deflate";
scoped_ptr<SpdyHeaderBlock> headers2(
spdy_util_.ConstructGetHeaderBlock("http://www.foo.com/index.php"));
(*headers2)["user-agent"] = "";
- (*headers2)["accept-encoding"] = "gzip,deflate";
+ (*headers2)["accept-encoding"] = "gzip, deflate";
// Setup writes/reads to www.google.com
scoped_ptr<SpdyFrame> req(
@@ -2518,7 +2518,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) {
scoped_ptr<SpdyHeaderBlock> headers(
spdy_util_.ConstructGetHeaderBlock("http://www.google.com/"));
(*headers)["user-agent"] = "";
- (*headers)["accept-encoding"] = "gzip,deflate";
+ (*headers)["accept-encoding"] = "gzip, deflate";
// Setup writes/reads to www.google.com
scoped_ptr<SpdyFrame> req(
@@ -2551,7 +2551,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) {
scoped_ptr<SpdyHeaderBlock> headers2(
spdy_util_.ConstructGetHeaderBlock("http://www.foo.com/index.php"));
(*headers2)["user-agent"] = "";
- (*headers2)["accept-encoding"] = "gzip,deflate";
+ (*headers2)["accept-encoding"] = "gzip, deflate";
scoped_ptr<SpdyFrame> req2(
spdy_util_.ConstructSpdySyn(1, *headers2, LOWEST, false, true));
scoped_ptr<SpdyFrame> resp2(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));
diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc
index 0f77cea..3ecb97e 100644
--- a/net/url_request/url_request_ftp_job_unittest.cc
+++ b/net/url_request/url_request_ftp_job_unittest.cc
@@ -660,7 +660,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) {
"Host: ftp.example.com\r\n"
"Connection: keep-alive\r\n"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n"
+ "Accept-Encoding: gzip, deflate\r\n"
"Accept-Language: en-us,fr\r\n\r\n"),
};
MockRead reads1[] = {
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 3c777a3..38c2bef 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -521,11 +521,11 @@ void URLRequestHttpJob::AddExtraHeaders() {
if (!advertise_sdch) {
// Tell the server what compression formats we support (other than SDCH).
request_info_.extra_headers.SetHeader(
- HttpRequestHeaders::kAcceptEncoding, "gzip,deflate");
+ HttpRequestHeaders::kAcceptEncoding, "gzip, deflate");
} else {
// Include SDCH in acceptable list.
request_info_.extra_headers.SetHeader(
- HttpRequestHeaders::kAcceptEncoding, "gzip,deflate,sdch");
+ HttpRequestHeaders::kAcceptEncoding, "gzip, deflate, sdch");
if (!avail_dictionaries.empty()) {
request_info_.extra_headers.SetHeader(
kAvailDictionaryHeader,
diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc
index e964b55..5cb84d6 100644
--- a/net/url_request/url_request_http_job_unittest.cc
+++ b/net/url_request/url_request_http_job_unittest.cc
@@ -75,7 +75,7 @@ class URLRequestHttpJobTest : public ::testing::Test {
// This check isn't wrapped with EXPECT* macros because different
// results from this function may be expected in different tests.
std::vector<std::string> tokens;
- size_t num_tokens = Tokenize(encoding_headers, ",", &tokens);
+ size_t num_tokens = Tokenize(encoding_headers, ", ", &tokens);
for (size_t i = 0; i < num_tokens; i++) {
if (!base::strncasecmp(tokens[i].data(), "sdch", tokens[i].length()))
return true;
diff --git a/net/websockets/websocket_handshake_stream_create_helper_test.cc b/net/websockets/websocket_handshake_stream_create_helper_test.cc
index 6446794..88b868f 100644
--- a/net/websockets/websocket_handshake_stream_create_helper_test.cc
+++ b/net/websockets/websocket_handshake_stream_create_helper_test.cc
@@ -119,7 +119,7 @@ class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
headers.SetHeader("Origin", origin);
headers.SetHeader("Sec-WebSocket-Version", "13");
headers.SetHeader("User-Agent", "");
- headers.SetHeader("Accept-Encoding", "gzip,deflate");
+ headers.SetHeader("Accept-Encoding", "gzip, deflate");
headers.SetHeader("Accept-Language", "en-us,fr");
HttpResponseInfo response;
diff --git a/net/websockets/websocket_stream_test.cc b/net/websockets/websocket_stream_test.cc
index 9a6cfd1..c90777f 100644
--- a/net/websockets/websocket_stream_test.cc
+++ b/net/websockets/websocket_stream_test.cc
@@ -333,7 +333,7 @@ class WebSocketStreamCreateBasicAuthTest : public WebSocketStreamCreateTest {
"Origin: http://localhost\r\n"
"Sec-WebSocket-Version: 13\r\n"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n"
+ "Accept-Encoding: gzip, deflate\r\n"
"Accept-Language: en-us,fr\r\n"
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; "
@@ -390,7 +390,7 @@ const char WebSocketStreamCreateDigestAuthTest::kAuthorizedRequest[] =
"Origin: http://localhost\r\n"
"Sec-WebSocket-Version: 13\r\n"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n"
+ "Accept-Encoding: gzip, deflate\r\n"
"Accept-Language: en-us,fr\r\n"
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; "
@@ -476,7 +476,7 @@ TEST_F(WebSocketStreamCreateTest, HandshakeInfo) {
EXPECT_EQ(HeaderKeyValuePair("Sec-WebSocket-Version", "13"),
request_headers[6]);
EXPECT_EQ(HeaderKeyValuePair("User-Agent", ""), request_headers[7]);
- EXPECT_EQ(HeaderKeyValuePair("Accept-Encoding", "gzip,deflate"),
+ EXPECT_EQ(HeaderKeyValuePair("Accept-Encoding", "gzip, deflate"),
request_headers[8]);
EXPECT_EQ(HeaderKeyValuePair("Accept-Language", "en-us,fr"),
request_headers[9]);
diff --git a/net/websockets/websocket_test_util.cc b/net/websockets/websocket_test_util.cc
index 60593f6..65613b5 100644
--- a/net/websockets/websocket_test_util.cc
+++ b/net/websockets/websocket_test_util.cc
@@ -48,7 +48,7 @@ std::string WebSocketStandardRequest(const std::string& path,
"Origin: %s\r\n"
"Sec-WebSocket-Version: 13\r\n"
"User-Agent:\r\n"
- "Accept-Encoding: gzip,deflate\r\n"
+ "Accept-Encoding: gzip, deflate\r\n"
"Accept-Language: en-us,fr\r\n"
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits\r\n"