Revert "okHttp: Set max_concurrent_stream to 0 before the connection is connected."

This reverts commit b1e2aae.
Broke tests.

Author: zhangkun83

okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java

@@ -154,7 +154,7 @@ class OkHttpClientTransport implements ClientTransport {
   private SSLSocketFactory sslSocketFactory;
   private Socket socket;
   @GuardedBy("lock")
-  private int maxConcurrentStreams = 0;
+  private int maxConcurrentStreams = Integer.MAX_VALUE;
   @GuardedBy("lock")
   private LinkedList<OkHttpClientStream> pendingStreams = new LinkedList<OkHttpClientStream>();
   private final ConnectionSpec connectionSpec;
@@ -322,14 +322,9 @@ public void run() {
           clientFrameHandler = new ClientFrameHandler(testFrameReader);
           executor.execute(clientFrameHandler);
           connectedCallback.run();
-          synchronized (lock) {
-            maxConcurrentStreams = Integer.MAX_VALUE;
-          }
           frameWriter.becomeConnected(testFrameWriter, socket);
-          startPendingStreams();
           return;
         }
-
         BufferedSource source;
         BufferedSink sink;
         Socket sock;
@@ -360,7 +355,6 @@ public void run() {
             return;
           }
           socket = sock;
-          maxConcurrentStreams = Integer.MAX_VALUE;
         }
 
         Variant variant = new Http2();
@@ -383,7 +377,6 @@ public void run() {
           OkHttpClientTransport.this.listener.transportReady();
         }
         executor.execute(clientFrameHandler);
-        startPendingStreams();
       }
     });
   }

okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java

@@ -144,9 +144,8 @@ public void setUp() {
     frameReader = new MockFrameReader();
   }
 
-  private void initTransport() throws Exception {
+  private void initTransport() {
     initTransport(3, new ConnectedCallback(false));
-    connectedCallback.waitUntilConnected();
   }
 
   private void initTransport(int startId, ConnectedCallback connectedCallback) {
@@ -1092,7 +1091,17 @@ public void cancelBeforeConnected() throws Exception {
     verifyNoMoreInteractions(frameWriter);
 
     connectedCallback.allowConnected();
-    verifyNoMoreInteractions(frameWriter);
+
+    // There should be 4 pending operations
+    verify(frameWriter, timeout(TIME_OUT_MS)).synStream(
+        eq(false), eq(false), eq(3), eq(0), Matchers.<List<Header>>any());
+    verify(frameWriter, timeout(TIME_OUT_MS)).flush();
+    verify(frameWriter, timeout(TIME_OUT_MS)).rstStream(eq(3), eq(ErrorCode.CANCEL));
+
+    // TODO(madongfly): Is this really what we want, we may just throw away the messages of
+    // a cancelled stream.
+    verify(frameWriter, timeout(TIME_OUT_MS))
+        .data(eq(false), eq(3), any(Buffer.class), eq(12 + HEADER_LENGTH));
   }
 
   @Test
@@ -1105,10 +1114,17 @@ public void shutdownDuringConnecting() throws Exception {
     clientTransport.shutdown();
     connectedCallback.allowConnected();
 
-    // The new stream should be failed, as well as the pending stream.
+    // The new stream should be failed, but the started stream should not be affected.
     assertNewStreamFail();
-    listener.waitUntilStreamClosed();
-    assertEquals(Status.UNAVAILABLE.getCode(), listener.status.getCode());
+    InputStream input = new ByteArrayInputStream(message.getBytes(UTF_8));
+    stream.writeMessage(input);
+    stream.flush();
+    ArgumentCaptor<Buffer> captor = ArgumentCaptor.forClass(Buffer.class);
+    verify(frameWriter, timeout(TIME_OUT_MS))
+        .data(eq(false), eq(3), captor.capture(), eq(12 + HEADER_LENGTH));
+    Buffer sentFrame = captor.getValue();
+    assertEquals(createMessageFrame(message), sentFrame);
+    stream.cancel(Status.CANCELLED);
   }
 
   private int activeStreamCount() {