Clean up the interface to DeserializeSecurityInfo, fix uninitialized memory use.

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 2896 matching lines @@
 }
 
 void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
     const GURL& url,
     const std::string& security_info,
     const std::string& http_method,
     const std::string& mime_type,
     ResourceType resource_type) {
 
   // Send out a notification that we loaded a resource from our memory cache.
-  int cert_id = 0;
-  net::CertStatus cert_status = 0;
-  int security_bits = -1;
-  int connection_status = 0;
-  SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids;
-  DeserializeSecurityInfo(security_info, &cert_id, &cert_status,
-                          &security_bits, &connection_status,
-                          &signed_certificate_timestamp_ids);
-  // TODO(alcutter,eranm): Pass signed_certificate_timestamp_ids into details
+  SSLStatus status = DeserializeSecurityInfo(security_info);
+  // TODO(alcutter,eranm): Pass signed_certificate_timestamp_ids into details.
   LoadFromMemoryCacheDetails details(
-      url, GetRenderProcessHost()->GetID(), cert_id, cert_status, http_method,
-      mime_type, resource_type);
+      url, GetRenderProcessHost()->GetID(), status.cert_id, status.cert_status,
+      http_method, mime_type, resource_type);
 
   controller_.ssl_manager()->DidLoadFromMemoryCache(details);
 
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidLoadResourceFromMemoryCache(details));
 
   if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
     scoped_refptr<net::URLRequestContextGetter> request_context(
         resource_type == RESOURCE_TYPE_MEDIA ?
             GetBrowserContext()->GetMediaRequestContextForRenderProcess(
@@ skipping 1537 matching lines @@
   player_map->erase(it);
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content