Wrap callback and call streams_->ReadFrames() on the same line

Just for readability

BUG=none

Review URL: https://codereview.chromium.org/171453007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252559 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 16 insertions, 11 deletions

diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc
index 9198047..d37bf19 100644
--- a/net/websockets/websocket_deflate_stream.cc
+++ b/net/websockets/websocket_deflate_stream.cc
@@ -57,16 +57,18 @@ WebSocketDeflateStream::~WebSocketDeflateStream() {}
 
 int WebSocketDeflateStream::ReadFrames(ScopedVector<WebSocketFrame>* frames,
                                        const CompletionCallback& callback) {
-  CompletionCallback callback_to_pass =
+  int result = stream_->ReadFrames(
+      frames,
       base::Bind(&WebSocketDeflateStream::OnReadComplete,
                  base::Unretained(this),
                  base::Unretained(frames),
-                 callback);
-  int result = stream_->ReadFrames(frames, callback_to_pass);
+                 callback));
   if (result < 0)
     return result;
   DCHECK_EQ(OK, result);
-  return InflateAndReadIfNecessary(frames, callback_to_pass);
+  DCHECK(!frames->empty());
+
+  return InflateAndReadIfNecessary(frames, callback);
 }
 
 int WebSocketDeflateStream::WriteFrames(ScopedVector<WebSocketFrame>* frames,
@@ -99,12 +101,7 @@ void WebSocketDeflateStream::OnReadComplete(
     return;
   }
 
-  int r = InflateAndReadIfNecessary(
-      frames,
-      base::Bind(&WebSocketDeflateStream::OnReadComplete,
-                 base::Unretained(this),
-                 base::Unretained(frames),
-                 callback));
+  int r = InflateAndReadIfNecessary(frames, callback);
   if (r != ERR_IO_PENDING)
     callback.Run(r);
 }
@@ -373,11 +370,18 @@ int WebSocketDeflateStream::InflateAndReadIfNecessary(
   int result = Inflate(frames);
   while (result == ERR_IO_PENDING) {
     DCHECK(frames->empty());
-    result = stream_->ReadFrames(frames, callback);
+
+    result = stream_->ReadFrames(
+        frames,
+        base::Bind(&WebSocketDeflateStream::OnReadComplete,
+                   base::Unretained(this),
+                   base::Unretained(frames),
+                   callback));
     if (result < 0)
       break;
     DCHECK_EQ(OK, result);
     DCHECK(!frames->empty());
+
     result = Inflate(frames);
   }
   if (result < 0)
diff --git a/net/websockets/websocket_deflate_stream.h b/net/websockets/websocket_deflate_stream.h
index e1c61ae..39ac2df 100644
--- a/net/websockets/websocket_deflate_stream.h
+++ b/net/websockets/websocket_deflate_stream.h
@@ -68,6 +68,7 @@ class NET_EXPORT_PRIVATE WebSocketDeflateStream : public WebSocketStream {
     NOT_WRITING,
   };
 
+  // Handles asynchronous completion of ReadFrames() call on |stream_|.
   void OnReadComplete(ScopedVector<WebSocketFrame>* frames,
                       const CompletionCallback& callback,
                       int result);