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

chrome/browser/renderer_host/resource_dispatcher_host.h

Index: chrome/browser/renderer_host/resource_dispatcher_host.h
===================================================================
--- chrome/browser/renderer_host/resource_dispatcher_host.h	(revision 11701)
+++ chrome/browser/renderer_host/resource_dispatcher_host.h	(working copy)
@@ -60,7 +60,8 @@
                      int process_id,
                      int route_id,
                      int request_id,
-                     bool mixed_content,
+                     std::string frame_origin,
+                     std::string main_frame_origin,
                      ResourceType::Type resource_type,
                      uint64 upload_size)
         : resource_handler(handler),
@@ -73,7 +74,8 @@
           pending_data_count(0),
           is_download(false),
           pause_count(0),
-          mixed_content(mixed_content),
+          frame_origin(frame_origin),
+          main_frame_origin(main_frame_origin),
           resource_type(resource_type),
           filter_policy(FilterPolicy::DONT_FILTER),
           last_load_state(net::LOAD_STATE_IDLE),
@@ -115,10 +117,10 @@
     // The number of clients that have called pause on this request.
     int pause_count;
 
-    // Whether this request is served over HTTP and the main page was served
-    // over HTTPS.
-    bool mixed_content;
+    std::string frame_origin;
 
+    std::string main_frame_origin;
+
     ResourceType::Type resource_type;
 
     // Whether the content for this request should be filtered (on the renderer
@@ -371,12 +373,10 @@
   friend class ShutdownTask;
 
   struct BlockedRequest {
-    BlockedRequest(URLRequest* url_request, bool mixed_content)
-        : url_request(url_request),
-          mixed_content(mixed_content) {
+    BlockedRequest(URLRequest* url_request)
+        : url_request(url_request) {
     }
     URLRequest* url_request;
-    bool mixed_content;
   };
 
   // A shutdown helper that runs on the IO thread.
@@ -411,7 +411,7 @@
                      bool allow_delete);
 
   // Helper function for regular and download requests.
-  void BeginRequestInternal(URLRequest* request, bool mixed_content);
+  void BeginRequestInternal(URLRequest* request);
 
   // Updates the "cost" of outstanding requests for |process_id|.
   // The "cost" approximates how many bytes are consumed by all the in-memory