Landing recent QUIC changes until Sun Mar 5 09:18:09 2017 +0000

net/quic/core/frames/quic_frame.cc

 // Copyright (c) 2016 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/quic/core/frames/quic_frame.h"
 #include "net/quic/platform/api/quic_logging.h"
 
 using std::string;
 
 namespace net {
@@ skipping 25 matching lines @@
 
 QuicFrame::QuicFrame(QuicGoAwayFrame* frame)
     : type(GOAWAY_FRAME), goaway_frame(frame) {}
 
 QuicFrame::QuicFrame(QuicWindowUpdateFrame* frame)
     : type(WINDOW_UPDATE_FRAME), window_update_frame(frame) {}
 
 QuicFrame::QuicFrame(QuicBlockedFrame* frame)
     : type(BLOCKED_FRAME), blocked_frame(frame) {}
 
-QuicFrame::QuicFrame(QuicPathCloseFrame* frame)
-    : type(PATH_CLOSE_FRAME), path_close_frame(frame) {}
-
 void DeleteFrames(QuicFrames* frames) {
   for (QuicFrame& frame : *frames) {
     switch (frame.type) {
       // Frames smaller than a pointer are inlined, so don't need to be deleted.
       case PADDING_FRAME:
       case MTU_DISCOVERY_FRAME:
       case PING_FRAME:
         break;
       case STREAM_FRAME:
         delete frame.stream_frame;
@@ skipping 12 matching lines @@
         break;
       case GOAWAY_FRAME:
         delete frame.goaway_frame;
         break;
       case BLOCKED_FRAME:
         delete frame.blocked_frame;
         break;
       case WINDOW_UPDATE_FRAME:
         delete frame.window_update_frame;
         break;
-      case PATH_CLOSE_FRAME:
-        delete frame.path_close_frame;
-        break;
       case NUM_FRAME_TYPES:
         DCHECK(false) << "Cannot delete type: " << frame.type;
     }
   }
   frames->clear();
 }
 
 void RemoveFramesForStream(QuicFrames* frames, QuicStreamId stream_id) {
   QuicFrames::iterator it = frames->begin();
   while (it != frames->end()) {
@@ skipping 46 matching lines @@
       break;
     }
     case PING_FRAME: {
       os << "type { PING_FRAME } ";
       break;
     }
     case MTU_DISCOVERY_FRAME: {
       os << "type { MTU_DISCOVERY_FRAME } ";
       break;
     }
-    case PATH_CLOSE_FRAME: {
-      os << "type { PATH_CLOSE_FRAME } " << *(frame.path_close_frame);
-      break;
-    }
     default: {
       QUIC_LOG(ERROR) << "Unknown frame type: " << frame.type;
       break;
     }
   }
   return os;
 }
 
 }  // namespace net