Index: net/url_request/url_request_http_job_unittest.cc |
diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc |
index d7a7c83f1bb4c8ec6aacb0a84fdd4812fc91c1cc..38b30629abb3862fa5b7634919aa4b1399071e5c 100644 |
--- a/net/url_request/url_request_http_job_unittest.cc |
+++ b/net/url_request/url_request_http_job_unittest.cc |
@@ -631,6 +631,84 @@ TEST_F(URLRequestHttpJobTest, SdchAdvertisementPost) { |
EXPECT_FALSE(TransactionAcceptsSdchEncoding()); |
} |
+class URLRequestHttpJobWithBrotliSupportTest : public ::testing::Test { |
+ protected: |
+ URLRequestHttpJobWithBrotliSupportTest() |
+ : context_(new TestURLRequestContext(true)) { |
+ scoped_ptr<HttpNetworkSession::Params> params( |
+ new HttpNetworkSession::Params); |
+ params->enable_brotli = true; |
+ context_->set_http_network_session_params(params.Pass()); |
+ context_->set_client_socket_factory(&socket_factory_); |
+ context_->Init(); |
+ } |
+ |
+ MockClientSocketFactory socket_factory_; |
+ scoped_ptr<TestURLRequestContext> context_; |
+}; |
+ |
+TEST_F(URLRequestHttpJobWithBrotliSupportTest, NoBrotliAdvertisementOverHttp) { |
+ MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)}; |
+ MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n" |
+ "Content-Length: 12\r\n\r\n"), |
+ MockRead("Test Content")}; |
+ StaticSocketDataProvider socket_data(reads, arraysize(reads), writes, |
+ arraysize(writes)); |
+ socket_factory_.AddSocketDataProvider(&socket_data); |
+ |
+ TestDelegate delegate; |
+ scoped_ptr<URLRequest> request = |
+ context_->CreateRequest(GURL("http://www.example.com"), DEFAULT_PRIORITY, |
+ &delegate) |
+ .Pass(); |
+ request->Start(); |
+ base::RunLoop().RunUntilIdle(); |
+ |
+ EXPECT_TRUE(request->status().is_success()); |
+ EXPECT_EQ(12, request->received_response_content_length()); |
+ EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
+ request->GetTotalSentBytes()); |
+ EXPECT_EQ(CountReadBytes(reads, arraysize(reads)), |
+ request->GetTotalReceivedBytes()); |
+} |
+ |
+TEST_F(URLRequestHttpJobWithBrotliSupportTest, BrotliAdvertisement) { |
+ net::SSLSocketDataProvider ssl_socket_data_provider(net::ASYNC, net::OK); |
+ ssl_socket_data_provider.SetNextProto(kProtoHTTP11); |
+ ssl_socket_data_provider.cert = |
+ ImportCertFromFile(GetTestCertsDirectory(), "unittest.selfsigned.der"); |
+ socket_factory_.AddSSLSocketDataProvider(&ssl_socket_data_provider); |
+ |
+ MockWrite writes[] = { |
+ MockWrite("GET / HTTP/1.1\r\n" |
+ "Host: www.example.com\r\n" |
+ "Connection: keep-alive\r\n" |
+ "User-Agent:\r\n" |
+ "Accept-Encoding: gzip, deflate, br\r\n" |
+ "Accept-Language: en-us,fr\r\n\r\n")}; |
+ MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n" |
+ "Content-Length: 12\r\n\r\n"), |
+ MockRead("Test Content")}; |
+ StaticSocketDataProvider socket_data(reads, arraysize(reads), writes, |
+ arraysize(writes)); |
+ socket_factory_.AddSocketDataProvider(&socket_data); |
+ |
+ TestDelegate delegate; |
+ scoped_ptr<URLRequest> request = |
+ context_->CreateRequest(GURL("https://www.example.com"), DEFAULT_PRIORITY, |
+ &delegate) |
+ .Pass(); |
+ request->Start(); |
+ base::RunLoop().RunUntilIdle(); |
+ |
+ EXPECT_TRUE(request->status().is_success()); |
+ EXPECT_EQ(12, request->received_response_content_length()); |
+ EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
+ request->GetTotalSentBytes()); |
+ EXPECT_EQ(CountReadBytes(reads, arraysize(reads)), |
+ request->GetTotalReceivedBytes()); |
+} |
+ |
// This base class just serves to set up some things before the TestURLRequest |
// constructor is called. |
class URLRequestHttpJobWebSocketTestBase : public ::testing::Test { |