net: disable SSL compression

This change also updates the page-info dialog to assume that compression isn't
used. It doesn't, however, remove the message from the .grd file in order to
make this change easier to merge.

BUG=139744

Review URL: https://chromiumcodereview.appspot.com/10823111

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

chrome/browser/page_info_model.cc

@@ -241,18 +241,15 @@ PageInfoModel::PageInfoModel(Profile* profile,
         IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
         ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
 
-    description += ASCIIToUTF16("\n\n");
     uint8 compression_id =
         net::SSLConnectionStatusToCompression(ssl.connection_status);
     if (compression_id) {
       const char* compression;
       net::SSLCompressionToString(&compression, compression_id);
+      description += ASCIIToUTF16("\n\n");
       description += l10n_util::GetStringFUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_COMPRESSION_DETAILS,
           ASCIIToUTF16(compression));
-    } else {
-      description += l10n_util::GetStringUTF16(
-          IDS_PAGE_INFO_SECURITY_TAB_NO_COMPRESSION);
     }
 
     if (did_fallback) {

net/socket/ssl_client_socket_nss.cc

@@ -3125,17 +3125,6 @@ int SSLClientSocketNSS::InitializeSSLOptions() {
   #error "You need to install NSS-3.12 or later to build chromium"
 #endif
 
-#ifdef SSL_ENABLE_DEFLATE
-  // Some web servers have been found to break if TLS is used *or* if DEFLATE
-  // is advertised. Thus, if TLS is disabled (probably because we are doing
-  // SSLv3 fallback), we disable DEFLATE also.
-  // See http://crbug.com/31628
-  rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_DEFLATE,
-                     ssl_config_.version_max >= SSL_PROTOCOL_VERSION_TLS1);
-  if (rv != SECSuccess)
-    LogFailedNSSFunction(net_log_, "SSL_OptionSet", "SSL_ENABLE_DEFLATE");
-#endif
-
 #ifdef SSL_ENABLE_FALSE_START
   rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_FALSE_START,
                      ssl_config_.false_start_enabled);