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

chrome/common/resource_dispatcher.h

 // 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #ifndef CHROME_COMMON_RESOURCE_DISPATCHER_H__
 #define CHROME_COMMON_RESOURCE_DISPATCHER_H__
 
 #include <deque>
@@ skipping 21 matching lines @@
   // handled, else false.
   bool OnMessageReceived(const IPC::Message& message);
 
   // creates a ResourceLoaderBridge for this type of dispatcher, this is so
   // this can be tested regardless of the ResourceLoaderBridge::Create
   // implementation.
   webkit_glue::ResourceLoaderBridge* CreateBridge(const std::string& method,
     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,
     uint32 request_context /* used for plugin->browser requests */,
     int route_id);
 
   // Adds a request from the pending_requests_ list, returning the new
   // requests' ID
   int AddPendingRequest(webkit_glue::ResourceLoaderBridge::Peer* callback,
-                        ResourceType::Type resource_type,
-                        bool mixed_content);
+                        ResourceType::Type resource_type);
 
   // Removes a request from the pending_requests_ list, returning true if the
   // request was found and removed.
   bool RemovePendingRequest(int request_id);
 
   IPC::Message::Sender* message_sender() const {
     return message_sender_;
   }
 
   // Toggles the is_deferred attribute for the specified request.
   void SetDefersLoading(int request_id, bool value);
 
   // Returns true if the message passed in is a resource related
   // message.
   bool IsResourceMessage(const IPC::Message& message) const;
 
  private:
   friend class ResourceDispatcherTest;
 
   typedef std::deque<IPC::Message*> MessageQueue;
   struct PendingRequestInfo {
     PendingRequestInfo() { }
     PendingRequestInfo(webkit_glue::ResourceLoaderBridge::Peer* peer,
-                       ResourceType::Type resource_type,
-                       bool mixed_content)
+                       ResourceType::Type resource_type)
         : peer(peer),
           resource_type(resource_type),
           filter_policy(FilterPolicy::DONT_FILTER),
-          mixed_content(mixed_content),
           is_deferred(false) {
     }
     ~PendingRequestInfo() { }
     webkit_glue::ResourceLoaderBridge::Peer* peer;
     ResourceType::Type resource_type;
     FilterPolicy::Type filter_policy;
     MessageQueue deferred_message_queue;
-    bool mixed_content;
     bool is_deferred;
   };
   typedef base::hash_map<int, PendingRequestInfo> PendingRequestList;
 
   // Message response handlers, called by the message handler for this process.
   void OnUploadProgress(const IPC::Message& message,
                         int request_id,
                         int64 position,
                         int64 size);
   void OnDownloadProgress(const IPC::Message& message,
@@ skipping 19 matching lines @@
 
   // All pending requests issued to the host
   PendingRequestList pending_requests_;
 
   ScopedRunnableMethodFactory<ResourceDispatcher> method_factory_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ResourceDispatcher);
 };
 
 #endif  // CHROME_COMMON_RESOURCE_DISPATCHER_H__