Minor changes to allow better testing of server push

net/quic/quic_client_promised_info.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_CLIENT_PROMISED_INFO_H_
 #define NET_QUIC_QUIC_CLIENT_PROMISED_INFO_H_
 
 #include <sys/types.h>
 #include <string>
 
@@ skipping 36 matching lines @@
   void OnResponseHeaders(const SpdyHeaderBlock& response_headers);
 
   // Rendezvous between this promised stream and a client request that
   // has a matching URL.
   virtual QuicAsyncStatus HandleClientRequest(
       const SpdyHeaderBlock& headers,
       QuicClientPushPromiseIndex::Delegate* delegate);
 
   void Cancel() override;
 
+  void Reset(QuicRstStreamErrorCode error_code);
+
   // Client requests are initially associated to promises by matching
   // URL in the client request against the URL in the promise headers,
   // uing the |promised_by_url| map.  The push can be cross-origin, so
   // the client should validate that the session is authoritative for
   // the promised URL.  If not, it should call |RejectUnauthorized|.
   QuicClientSessionBase* session() { return session_; }
 
   // If the promised response contains Vary header, then the fields
   // specified by Vary must match between the client request header
   // and the promise headers (see https://crbug.com//554220).  Vary
@@ skipping 14 matching lines @@
   class CleanupAlarm : public QuicAlarm::Delegate {
    public:
     explicit CleanupAlarm(QuicClientPromisedInfo* promised)
         : promised_(promised) {}
 
     void OnAlarm() override;
 
     QuicClientPromisedInfo* promised_;
   };
 
-  void Reset(QuicRstStreamErrorCode error_code);
-
   QuicAsyncStatus FinalValidation();
 
   QuicClientSessionBase* session_;
   QuicConnectionHelperInterface* helper_;
   QuicStreamId id_;
   std::string url_;
   std::unique_ptr<SpdyHeaderBlock> request_headers_;
   std::unique_ptr<SpdyHeaderBlock> response_headers_;
   std::unique_ptr<SpdyHeaderBlock> client_request_headers_;
   QuicClientPushPromiseIndex::Delegate* client_request_delegate_;
 
   // The promise will commit suicide eventually if it is not claimed
   // by a GET first.
   std::unique_ptr<QuicAlarm> cleanup_alarm_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClientPromisedInfo);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CLIENT_PROMISED_INFO_H_