Add brotli content-encoding filter.

net/url_request/url_request_http_job_unittest.cc

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 dca3e8e979e7c2daa3801960b541255a5e1c7ef9..53c465de8e508b8e6bbcef30dfa5d2a685dc8693 100644
--- a/net/url_request/url_request_http_job_unittest.cc
+++ b/net/url_request/url_request_http_job_unittest.cc
@@ -629,6 +629,68 @@ 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();
+  }
+
+  void RunRequest(const GURL& url) {
+    TestDelegate delegate;
+    scoped_ptr<URLRequest> request(
+        context_->CreateRequest(url, DEFAULT_PRIORITY, &delegate));
+    request->Start();
+    base::RunLoop().RunUntilIdle();
+    EXPECT_NE(0, request->GetTotalSentBytes());

[xunjieli, 2015/12/07 16:27:20]

Why is this 0? It is because it is a GET request? Maybe consider getting rid of
this line and add assertions in the test itself.

  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());

[eustas, 2015/12/08 11:31:31]

Surely. Done.

+  }
+
+  MockClientSocketFactory socket_factory_;
+
+ private:
+  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);
+  RunRequest(GURL("http://www.example.com"));
+}
+
+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 accept_brotli_encoding_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), accept_brotli_encoding_writes,
+      arraysize(accept_brotli_encoding_writes));
+  socket_factory_.AddSocketDataProvider(&socket_data);
+  RunRequest(GURL("https://www.example.com"));
+}
+
 // This base class just serves to set up some things before the TestURLRequest
 // constructor is called.
 class URLRequestHttpJobWebSocketTestBase : public ::testing::Test {