SSL Fix: Step 4....

chrome/browser/tab_contents/web_contents.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/tab_contents/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 908 matching lines @@
     entry = controller()->GetEntryWithPageID(type(), GetSiteInstance(),
                                              page_id);
   }
   if (!entry || entry->tab_type() != type() || entry->url() != source_url)
     return;
   entry->set_url(target_url);
 }
 
 void WebContents::DidLoadResourceFromMemoryCache(
     const GURL& url,
+    const std::string& frame_origin,
+    const std::string& main_frame_origin,
     const std::string& security_info) {
   if (!controller())
     return;
 
   // Send out a notification that we loaded a resource from our memory cache.
   int cert_id = 0, cert_status = 0, security_bits = 0;
   SSLManager::DeserializeSecurityInfo(security_info,
                                       &cert_id, &cert_status,
                                       &security_bits);
-  LoadFromMemoryCacheDetails details(url, cert_id, cert_status);
+  LoadFromMemoryCacheDetails details(url, frame_origin, main_frame_origin,
+                                     cert_id, cert_status);
 
   NotificationService::current()->Notify(
       NotificationType::LOAD_FROM_MEMORY_CACHE,
       Source<NavigationController>(controller()),
       Details<LoadFromMemoryCacheDetails>(&details));
 }
 
 void WebContents::DidFailProvisionalLoadWithError(
     RenderViewHost* render_view_host,
     bool is_main_frame,
@@ skipping 929 matching lines @@
     // The favicon url isn't valid. This means there really isn't a favicon,
     // or the favicon url wasn't obtained before the load started. This assumes
     // the later.
     // TODO(sky): Need a way to set the favicon that doesn't involve generating
     // its url.
     new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer));
   }
   new_url->set_safe_for_autoreplace(true);
   url_model->Add(new_url);
 }