Merge Chromium.org at r11.0.672.0: Initial merge by git.

Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192

1 files changed, 23 insertions, 24 deletions

diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
index d6df3ea..e18179d 100644
--- a/net/base/ssl_config_service.cc
+++ b/net/base/ssl_config_service.cc
@@ -23,9 +23,8 @@ SSLConfig::SSLConfig()
     : rev_checking_enabled(true), ssl3_enabled(true),
       tls1_enabled(true), dnssec_enabled(false), snap_start_enabled(false),
       dns_cert_provenance_checking_enabled(false),
-      session_resume_disabled(false), mitm_proxies_allowed(false),
-      false_start_enabled(true), send_client_cert(false),
-      verify_ev_cert(false), ssl3_fallback(false) {
+      mitm_proxies_allowed(false), false_start_enabled(true),
+      send_client_cert(false), verify_ev_cert(false), ssl3_fallback(false) {
 }
 
 SSLConfig::~SSLConfig() {
@@ -43,9 +42,6 @@ SSLConfigService::SSLConfigService()
     : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
-SSLConfigService::~SSLConfigService() {
-}
-
 // static
 SSLConfigService* SSLConfigService::CreateSystemSSLConfigService() {
 #if defined(OS_WIN)
@@ -104,16 +100,6 @@ static bool g_snap_start_enabled = false;
 static bool g_dns_cert_provenance_checking = false;
 
 // static
-void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
-  ssl_config->dnssec_enabled = g_dnssec_enabled;
-  ssl_config->false_start_enabled = g_false_start_enabled;
-  ssl_config->mitm_proxies_allowed = g_mitm_proxies_allowed;
-  ssl_config->snap_start_enabled = g_snap_start_enabled;
-  ssl_config->dns_cert_provenance_checking_enabled =
-      g_dns_cert_provenance_checking;
-}
-
-// static
 void SSLConfigService::EnableDNSSEC() {
   g_dnssec_enabled = true;
 }
@@ -134,23 +120,23 @@ bool SSLConfigService::snap_start_enabled() {
 }
 
 // static
-void SSLConfigService::DisableFalseStart() {
-  g_false_start_enabled = false;
+void SSLConfigService::AllowMITMProxies() {
+  g_mitm_proxies_allowed = true;
 }
 
 // static
-bool SSLConfigService::false_start_enabled() {
-  return g_false_start_enabled;
+bool SSLConfigService::mitm_proxies_allowed() {
+  return g_mitm_proxies_allowed;
 }
 
 // static
-void SSLConfigService::AllowMITMProxies() {
-  g_mitm_proxies_allowed = true;
+void SSLConfigService::DisableFalseStart() {
+  g_false_start_enabled = false;
 }
 
 // static
-bool SSLConfigService::mitm_proxies_allowed() {
-  return g_mitm_proxies_allowed;
+bool SSLConfigService::false_start_enabled() {
+  return g_false_start_enabled;
 }
 
 // static
@@ -171,6 +157,19 @@ void SSLConfigService::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
+SSLConfigService::~SSLConfigService() {
+}
+
+// static
+void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
+  ssl_config->dnssec_enabled = g_dnssec_enabled;
+  ssl_config->false_start_enabled = g_false_start_enabled;
+  ssl_config->mitm_proxies_allowed = g_mitm_proxies_allowed;
+  ssl_config->snap_start_enabled = g_snap_start_enabled;
+  ssl_config->dns_cert_provenance_checking_enabled =
+      g_dns_cert_provenance_checking;
+}
+
 void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config,
                                            const SSLConfig& new_config) {
   if (orig_config.rev_checking_enabled != new_config.rev_checking_enabled ||