Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: net/http/http_stream_factory_impl_job.h

Issue 2152453002: Remove ALTERNATIVE_CERT_NOT_VALID_FOR_ORIGIN error code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.h
diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
index 0f7b1777ae5514418b832a8a91510b9d4a9ebaef..e24f1bae50f7f555856d50ed8bfeb0ea431906bf 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -265,51 +265,6 @@ class HttpStreamFactoryImpl::Job {
STATUS_SUCCEEDED
};
- // Wrapper class for SpdySessionPool methods to enforce certificate
- // requirements for SpdySessions.
- class ValidSpdySessionPool {
- public:
- ValidSpdySessionPool(SpdySessionPool* spdy_session_pool,
- GURL& origin_url,
- bool is_spdy_alternative);
-
- // Returns OK if a SpdySession was not found (in which case |spdy_session|
- // is set to nullptr), or if one was found (in which case |spdy_session| is
- // set to it) and it has an associated SSL certificate with is valid for
- // |origin_url_|, or if this requirement does not apply because the Job is
- // not a SPDY alternative job. Returns the appropriate error code
- // otherwise,
- // in which case |spdy_session| should not be used.
- int FindAvailableSession(const SpdySessionKey& key,
- const BoundNetLog& net_log,
- base::WeakPtr<SpdySession>* spdy_session);
-
- // Creates a SpdySession and sets |spdy_session| to point to it. Returns OK
- // if the associated SSL certificate is valid for |origin_url_|, or if this
- // requirement does not apply because the Job is not a SPDY alternative job.
- // Returns the appropriate error code otherwise, in which case
- // |spdy_session| should not be used.
- int CreateAvailableSessionFromSocket(
- const SpdySessionKey& key,
- std::unique_ptr<ClientSocketHandle> connection,
- const BoundNetLog& net_log,
- int certificate_error_code,
- bool is_secure,
- base::WeakPtr<SpdySession>* spdy_session);
-
- private:
- // Returns OK if |spdy_session| has an associated SSL certificate with is
- // valid for |origin_url_|, or if this requirement does not apply because
- // the Job is not a SPDY alternative job, or if |spdy_session| is null.
- // Returns appropriate error code otherwise.
- int CheckAlternativeServiceValidityForOrigin(
- base::WeakPtr<SpdySession> spdy_session);
-
- SpdySessionPool* const spdy_session_pool_;
- const GURL origin_url_;
- const bool is_spdy_alternative_;
- };
-
// Resume the |this| job after the specified |wait_time_|.
void ResumeAfterDelay();
@@ -507,8 +462,6 @@ class HttpStreamFactoryImpl::Job {
// preconnect.
int num_streams_;
- std::unique_ptr<ValidSpdySessionPool> valid_spdy_session_pool_;
-
// Initialized when we create a new SpdySession.
base::WeakPtr<SpdySession> new_spdy_session_;
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698