[Cronet] Enable Brotli

components/cronet/android/test/src/org/chromium/net/Http2TestHandler.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import org.chromium.base.Log;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ skipping 23 matching lines @@
 /**
  * HTTP/2 test handler for Cronet BidirectionalStream tests.
  */
 public final class Http2TestHandler extends Http2ConnectionHandler implements Http2FrameListener {
     // Some Url Paths that have special meaning.
     public static final String ECHO_ALL_HEADERS_PATH = "/echoallheaders";
     public static final String ECHO_HEADER_PATH = "/echoheader";
     public static final String ECHO_METHOD_PATH = "/echomethod";
     public static final String ECHO_STREAM_PATH = "/echostream";
     public static final String ECHO_TRAILERS_PATH = "/echotrailers";
+    public static final String SERVE_SIMPLE_BROTLI_RESPONSE = "/simplebrotli";
 
     private static final String TAG = Http2TestHandler.class.getSimpleName();
     private static final Http2FrameLogger sLogger =
             new Http2FrameLogger(INFO, Http2TestHandler.class);
     private static final ByteBuf RESPONSE_BYTES =
             unreleasableBuffer(copiedBuffer("HTTP/2 Test Server", CharsetUtil.UTF_8));
 
     private HashMap<Integer, RequestResponder> mResponderMap = new HashMap<>();
 
     /**
@@ skipping 113 matching lines @@
                     ctx, streamId, createDefaultResponseHeaders(), 0, false, ctx.newPromise());
             encoder().writeData(
                     ctx, streamId, RESPONSE_BYTES.duplicate(), 0, false, ctx.newPromise());
             Http2Headers responseTrailers = createResponseHeadersFromRequestHeaders(headers).add(
                     "trailer", "value1", "Value2");
             encoder().writeHeaders(ctx, streamId, responseTrailers, 0, true, ctx.newPromise());
             ctx.flush();
         }
     }
 
+    // A RequestResponder that serves a simple Brotli-encoded response.
+    private class ServeSimpleBrotliResponder extends RequestResponder {
+        @Override
+        void onHeadersRead(ChannelHandlerContext ctx, int streamId, boolean endOfStream,
+                Http2Headers headers) {
+            Http2Headers responseHeaders = new DefaultHttp2Headers().status(OK.codeAsText());
+            byte[] quickfoxCompressed = {0x0b, 0x15, -1, 0x54, 0x68, 0x65, 0x20, 0x71, 0x75, 0x69,

[mef, 2017/04/14 17:02:07]

The third byte in curl
https://raw.githubusercontent.com/google/brotli/master/tests/testdata/quickfo...
not -1 as in this response. is this expected?.

[xunjieli, 2017/04/14 17:25:25]

The third byte is 0x80, but Java byte is signed so I used -1 to represent 0x80.

[mef, 2017/04/14 17:40:59]

I see, that might be the problem as -1 is 0xFF, not 0x80. I think 0x80 would be
-0x80. 

[xunjieli, 2017/04/14 18:24:15]

Done. sorry for the very stupid error. Not sure what I was thinking...

[mef, 2017/04/14 18:34:58]

No problem, but original test data has the '0x03' last byte. 
Can you try to restore it to see whether it still works?
I hope that fixing 0x80 would fix decompressed expectations.

[xunjieli, 2017/04/14 18:47:37]

Done. You are right! That fixed it. Thanks for catching this bug.

+                    0x63, 0x6b, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x20, 0x66, 0x6f, 0x78, 0x20,
+                    0x6a, 0x75, 0x6d, 0x70, 0x73, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x74, 0x68,
+                    0x65, 0x20, 0x6c, 0x61, 0x7a, 0x79, 0x20, 0x64, 0x6f, 0x67};
+            ByteBuf content = copiedBuffer(quickfoxCompressed);
+            responseHeaders.add("content-encoding", "br");
+            encoder().writeHeaders(ctx, streamId, responseHeaders, 0, false, ctx.newPromise());
+            encoder().writeData(ctx, streamId, content, 0, true, ctx.newPromise());
+            ctx.flush();
+        }
+    }
+
     private static Http2Headers createDefaultResponseHeaders() {
         return new DefaultHttp2Headers().status(OK.codeAsText());
     }
 
     private static Http2Headers createResponseHeadersFromRequestHeaders(
             Http2Headers requestHeaders) {
         // Create response headers by echoing request headers.
         Http2Headers responseHeaders = new DefaultHttp2Headers().status(OK.codeAsText());
         for (Map.Entry<CharSequence, CharSequence> header : requestHeaders) {
             if (!header.getKey().toString().startsWith(":")) {
@@ skipping 36 matching lines @@
         if (path.startsWith(ECHO_STREAM_PATH)) {
             responder = new EchoStreamResponder();
         } else if (path.startsWith(ECHO_TRAILERS_PATH)) {
             responder = new EchoTrailersResponder();
         } else if (path.startsWith(ECHO_ALL_HEADERS_PATH)) {
             responder = new EchoAllHeadersResponder();
         } else if (path.startsWith(ECHO_HEADER_PATH)) {
             responder = new EchoHeaderResponder();
         } else if (path.startsWith(ECHO_METHOD_PATH)) {
             responder = new EchoMethodResponder();
+        } else if (path.startsWith(SERVE_SIMPLE_BROTLI_RESPONSE)) {
+            responder = new ServeSimpleBrotliResponder();
         } else {
             responder = new RequestResponder();
         }
 
         responder.onHeadersRead(ctx, streamId, endOfStream, headers);
 
         if (!endOfStream) {
             mResponderMap.put(streamId, responder);
         }
     }
@@ skipping 35 matching lines @@
             ByteBuf debugData) throws Http2Exception {}
 
     @Override
     public void onWindowUpdateRead(ChannelHandlerContext ctx, int streamId, int windowSizeIncrement)
             throws Http2Exception {}
 
     @Override
     public void onUnknownFrame(ChannelHandlerContext ctx, byte frameType, int streamId,
             Http2Flags flags, ByteBuf payload) throws Http2Exception {}
 }