SSLPolicy Fix: Step 3.

Plumbing the security origin of the frame making the request to SSL land.

R=wtc
BUG=8706

Review URL: http://codereview.chromium.org/48038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11851 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 4 deletions

diff --git a/chrome/renderer/media/data_source_impl.cc b/chrome/renderer/media/data_source_impl.cc
index 9993352..e084413 100644
--- a/chrome/renderer/media/data_source_impl.cc
+++ b/chrome/renderer/media/data_source_impl.cc
@@ -216,13 +216,14 @@ void DataSourceImpl::OnInitialize(std::string uri) {
       GURL(uri),
       GURL(uri),
       GURL(),        // TODO(hclam): provide referer here.
+      "null",        // TODO(abarth): provide frame_origin
+      "null",        // TODO(abarth): provide main_frame_origin
       std::string(), // Provide no header.
       // Prefer to load from cache, also enable downloading the file, the
       // resource will be saved to a single response data file if it's possible.
       net::LOAD_PREFERRING_CACHE | net::LOAD_ENABLE_DOWNLOAD_FILE,
       base::GetCurrentProcId(),
       ResourceType::MEDIA,
-      false,
       0,
       delegate_->view()->routing_id());
   // Start the resource loading.
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index f741ffd..6ed28a0 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -233,16 +233,18 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create(
     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,
     int routing_id) {
   ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
-  return dispatch->CreateBridge(method, url, policy_url, referrer, headers,
+  return dispatch->CreateBridge(method, url, policy_url, referrer, 
+                                frame_origin, main_frame_origin, headers,
                                 load_flags, origin_pid, resource_type,
-                                mixed_content, 0, routing_id);
+                                0, routing_id);
 }
 
 void NotifyCacheStats() {