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

chrome/renderer/renderer_glue.cc

Index: chrome/renderer/renderer_glue.cc
===================================================================
--- chrome/renderer/renderer_glue.cc	(revision 11701)
+++ chrome/renderer/renderer_glue.cc	(working copy)
@@ -235,11 +235,12 @@
     const GURL& url,
     const GURL& policy_url,
     const GURL& referrer,
+    const std::string& frame_origin,
+    const std::string& main_frame_origin,
     const std::string& headers,
     int load_flags,
     int origin_pid,
-    ResourceType::Type resource_type,
-    bool mixed_content) {
+    ResourceType::Type resource_type) {
   // TODO(darin): we need to eliminate the webframe parameter because webkit
   // does not always supply it (see ResourceHandle::loadResourceSynchronously).
   // Instead we should add context to ResourceRequest, which will be easy to do
@@ -255,9 +256,10 @@
   RenderView* rv = static_cast<RenderView*>(webframe->GetView()->GetDelegate());
   int route_id = rv->routing_id();
   ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
-  return dispatch->CreateBridge(method, url, policy_url, referrer, headers,
-                                load_flags, origin_pid, resource_type,
-                                mixed_content, 0, route_id);
+  return dispatch->CreateBridge(method, url, policy_url, referrer,
+                                frame_origin, main_frame_origin, headers,
+                                load_flags, origin_pid, resource_type, 0,
+                                route_id);
 }
 
 void NotifyCacheStats() {