Revert 228112 "Land Recent QUIC changes."

> Land Recent QUIC changes.
> 
> Addressing comments in Jana's review of cr/52231261.
> 
> Merge internal change: 53582401
> 
> Add a temporary legacy quic constructor
> 
> Merge internal change: 53506960
> 
> QUIC: disable P-256 support on the server.
> 
> The P-256 key generation is done with OpenSSL, which doesn't use the
> QuicRandom passed to DefaultConfig(). This is causing the generated
> server configs to be non-deterministic and breaking 0-RTT handshakes.
> 
> Merge internal change: 53501783
> 
> Fix an LOG to use the correct condition in QuicReceivedPacketManager and
> change it to a DFATAL so in the future tests will prevent re-occurrence.
> 
> Merge internal change: 53483753
> 
> Cleanup: Rename OnIncomingAck to OnPacketAcked, and remove unneeeded
> argument from SentPacketManager::OnIncomingAck.
> 
> Merge internal change: 53483155
> 
> Fix a bug in QuicConnection/QuicConnectionHelper if the helper buffered
> the write (as is the case in chrome).  In this case, the sent packet was
> not accounted for properly.
> 
> Merge internal change: 53462749
> 
> Refactor to change WritePacket to return a WriteResult struct.
> 
> Merge internal change: 53382221
> 
> Fixing a bug where the version negotiation packet would get dropped on
> the floor if the socket was write blocked at the time it was sent. The
> packet is now queued.
> 
> Merge internal change: 53317846
> 
> Create a new QUIC_INVALID_CHANNEL_ID_SIGNATURE error to replace a usage
> of QUIC_INTERNAL_ERROR.
> 
> Merge internal change: 53277933
> 
> Added a todo to merge internal CL 53267501 when chromium's version of
> OpenSSL has latest AEAD code.
> 
> Didn't merge internal change: 53267501
> 
> R=rch@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=227827
> 
> Review URL: https://codereview.chromium.org/26385004

TBR=rtenneti@chromium.org

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

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

1 files changed, 6 insertions, 7 deletions

diff --git a/net/quic/quic_connection_helper_test.cc b/net/quic/quic_connection_helper_test.cc
index ffc6ee19..e228d12 100644
--- a/net/quic/quic_connection_helper_test.cc
+++ b/net/quic/quic_connection_helper_test.cc
@@ -10,7 +10,6 @@
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_connection.h"
-#include "net/quic/quic_protocol.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
@@ -410,9 +409,9 @@ TEST_F(QuicConnectionHelperTest, WritePacketToWire) {
   Initialize();
 
   int len = GetWrite(0)->length();
-  WriteResult result = helper_->WritePacketToWire(*GetWrite(0));
-  EXPECT_EQ(len, result.bytes_written);
-  EXPECT_EQ(WRITE_STATUS_OK, result.status);
+  int error = 0;
+  EXPECT_EQ(len, helper_->WritePacketToWire(*GetWrite(0), &error));
+  EXPECT_EQ(0, error);
   EXPECT_TRUE(AtEof());
 }
 
@@ -421,9 +420,9 @@ TEST_F(QuicConnectionHelperTest, WritePacketToWireAsync) {
   Initialize();
 
   EXPECT_CALL(visitor_, OnCanWrite()).WillOnce(Return(true));
-  WriteResult result = helper_->WritePacketToWire(*GetWrite(0));
-  EXPECT_EQ(-1, result.bytes_written);
-  EXPECT_EQ(WRITE_STATUS_BLOCKED, result.status);
+  int error = 0;
+  EXPECT_EQ(-1, helper_->WritePacketToWire(*GetWrite(0), &error));
+  EXPECT_EQ(ERR_IO_PENDING, error);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(AtEof());
 }