Fix our handling of mixed SSL / non-SSL content....

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc	(revision 11701)
+++ chrome/renderer/render_view.cc	(working copy)
@@ -1256,14 +1256,18 @@
        frame->GetProvisionalDataSource()->GetRequest().GetURL()));
 }
 
-bool RenderView::DidLoadResourceFromMemoryCache(WebView* webview,
-                                                const WebRequest& request,
-                                                const WebResponse& response,
-                                                WebFrame* frame) {
+bool RenderView::DidLoadResourceFromMemoryCache(
+    WebView* webview,
+    const WebRequest& request,
+    const WebResponse& response,
+    WebFrame* frame,
+    const std::string& frame_origin,
+    const std::string& main_frame_origin) {
   // Let the browser know we loaded a resource from the memory cache.  This
   // message is needed to display the correct SSL indicators.
   Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(routing_id_,
-      request.GetURL(), response.GetSecurityInfo()));
+      request.GetURL(), frame_origin, main_frame_origin,
+      response.GetSecurityInfo()));
 
   return false;
 }