Reland rest of r77399.

net/http/http_stream_factory_impl_request.h

 // Copyright (c) 2011 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_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_
 
 #include <set>
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
@@ skipping 19 matching lines @@
   // before knowing if SPDY is available.
   void SetSpdySessionKey(const HostPortProxyPair& spdy_session_key);
 
   // Attaches |job| to this request. Does not mean that Request will use |job|,
   // but Request will own |job|.
   void AttachJob(HttpStreamFactoryImpl::Job* job);
 
   // Marks completion of the request. Must be called before OnStreamReady().
   // |source| is the NetLog::Source generated by the Job that fulfilled this
   // request.
-  void Complete(bool was_alternate_protocol_available,
-                bool was_npn_negotiated,
+  void Complete(bool was_npn_negotiated,
                 bool using_spdy,
                 const NetLog::Source& source);
 
   // If this Request has a spdy_session_key, remove this session from the
   // SpdySessionRequestMap.
   void RemoveRequestFromSpdySessionRequestMap();
 
   // Called by an attached Job if it sets up a SpdySession.
   void OnSpdySessionReady(Job* job,
                           scoped_refptr<SpdySession> spdy_session,
@@ skipping 24 matching lines @@
       const HttpResponseInfo& response_info,
       const SSLConfig& used_ssl_config,
       const ProxyInfo& used_proxy_info,
       HttpStream* stream);
 
   // HttpStreamRequest methods.
 
   virtual int RestartTunnelWithProxyAuth(const string16& username,
                                          const string16& password);
   virtual LoadState GetLoadState() const;
-  virtual bool was_alternate_protocol_available() const;
   virtual bool was_npn_negotiated() const;
   virtual bool using_spdy() const;
 
  private:
   // Used to orphan all jobs in |jobs_| other than |job| which becomes "bound"
   // to the request.
   void OrphanJobsExcept(Job* job);
 
   // Used to orphan all jobs in |jobs_|.
   void OrphanJobs();
 
   const GURL url_;
   HttpStreamFactoryImpl* const factory_;
   HttpStreamRequest::Delegate* const delegate_;
   const BoundNetLog net_log_;
 
   // At the point where Job is irrevocably tied to the Request, we set this.
   scoped_ptr<Job> bound_job_;
   std::set<HttpStreamFactoryImpl::Job*> jobs_;
   scoped_ptr<const HostPortProxyPair> spdy_session_key_;
 
   bool completed_;
-  bool was_alternate_protocol_available_;
   bool was_npn_negotiated_;
   bool using_spdy_;
 
   DISALLOW_COPY_AND_ASSIGN(Request);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_