Refactor to address URLRequestContext dependency added in

http://codereview.chromium.org/6873029/

BUG=81009
Review URL: http://codereview.chromium.org/6930040

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

3 files changed, 6 insertions, 15 deletions

diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 09ac381..7e02641 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -58,15 +58,6 @@ const std::string& URLRequestContext::GetUserAgent(const GURL& url) const {
   return EmptyString();
 }
 
-bool URLRequestContext::IsSNIAvailable() const {
-  if (!ssl_config_service_)
-    return false;
-
-  SSLConfig ssl_config;
-  ssl_config_service_->GetSSLConfig(&ssl_config);
-  return ssl_config.tls1_enabled;
-}
-
 URLRequestContext::~URLRequestContext() {
 }
 
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 545f629..ae09f4d 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -180,9 +180,6 @@ class URLRequestContext
   bool is_main() const { return is_main_; }
   void set_is_main(bool is_main) { is_main_ = is_main; }
 
-  // Is SNI available in this request context?
-  bool IsSNIAvailable() const;
-
  protected:
   friend class base::RefCountedThreadSafe<URLRequestContext>;
 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index ae87029..2871797 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -192,7 +192,8 @@ URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request,
       request->context()->transport_security_state()->IsEnabledForHost(
           &domain_state,
           request->url().host(),
-          request->context()->IsSNIAvailable())) {
+          SSLConfigService::IsSNIAvailable(
+              request->context()->ssl_config_service()))) {
     if (domain_state.mode ==
          TransportSecurityState::DomainState::MODE_STRICT) {
       DCHECK_EQ(request->url().scheme(), "http");
@@ -675,7 +676,8 @@ void URLRequestHttpJob::OnStartCompleted(int result) {
     if (context_->transport_security_state()->HasPinsForHost(
             &domain_state,
             request_->url().host(),
-            context_->IsSNIAvailable())) {
+            SSLConfigService::IsSNIAvailable(
+                context_->ssl_config_service()))) {
       if (!domain_state.IsChainOfPublicKeysPermitted(
               ssl_info.public_key_hashes)) {
         result = ERR_CERT_INVALID;
@@ -734,7 +736,8 @@ bool URLRequestHttpJob::ShouldTreatAsCertificateError(int result) {
   TransportSecurityState::DomainState domain_state;
   // TODO(agl): don't ignore opportunistic mode.
   const bool r = context_->transport_security_state()->IsEnabledForHost(
-      &domain_state, request_info_.url.host(), context_->IsSNIAvailable());
+      &domain_state, request_info_.url.host(),
+      SSLConfigService::IsSNIAvailable(context_->ssl_config_service()));
 
   return !r || domain_state.mode ==
                TransportSecurityState::DomainState::MODE_OPPORTUNISTIC;