Flip: Fix cancellation code path.

net/flip/flip_session.cc

 // Copyright (c) 2009 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.
 
 #include "net/flip/flip_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
@@ skipping 443 matching lines @@
   if (result >= 0) {
     // TODO(mbelshe) Verify that we wrote ALL the bytes of the frame.
     //               The code current is broken in the case of a partial write.
     DCHECK_EQ(static_cast<size_t>(result), in_flight_write_.size());
 
     // We only notify the stream when we've fully written the pending flip
     // frame.
     scoped_refptr<FlipStream> stream = in_flight_write_.stream();
     DCHECK(stream.get());
 
-    if (!stream->cancelled()) {
-      // Report the number of bytes written to the caller, but exclude the
-      // frame size overhead.
-      if (result > 0) {
-        DCHECK(result > static_cast<int>(flip::FlipFrame::size()));
-        result -= static_cast<int>(flip::FlipFrame::size());
-      }
-      stream->OnWriteComplete(result);
+    // Report the number of bytes written to the caller, but exclude the
+    // frame size overhead.
+    if (result > 0) {
+      // TODO(willchan): This is an unsafe DCHECK.  I'm hitting this.  We should
+      // handle small writes appropriately.
+      DCHECK(result > static_cast<int>(flip::FlipFrame::size()));
+      result -= static_cast<int>(flip::FlipFrame::size());
     }
+    stream->OnWriteComplete(result);
 
     // Cleanup the write which just completed.
     in_flight_write_.release();
 
     // Write more data.  We're already in a continuation, so we can
     // go ahead and write it immediately (without going back to the
     // message loop).
     WriteSocketLater();
   } else {
     // TODO(mbelshe): Deal with result < 0 error case.
@@ skipping 370 matching lines @@
     LOG(ERROR) << "Flip stream closed: " << frame->status();
     // TODO(mbelshe): Map from Flip-protocol errors to something sensical.
     //                For now, it doesn't matter much - it is a protocol error.
     stream->OnClose(ERR_FAILED);
   }
 
   DeactivateStream(stream_id);
 }
 
 }  // namespace net