Remove frame_origin and main_frame_origin from network requests.

These properties have never worked properly and are a sandtrap for folk who
might think they work properly.  Extensions, for example, mistaken started
using them.  This patch removes them as we've finally removed all their
clients!  Yay cleanup!

TEST=No behavior change
BUG=None

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

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

27 files changed, 9 insertions, 154 deletions

diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 220cd06..e5f83a1 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -89,8 +89,7 @@ class DummyResourceHandler : public ResourceHandler {
 ResourceDispatcherHostRequestInfo* CreateRequestInfo(int request_id) {
   return new ResourceDispatcherHostRequestInfo(
       new DummyResourceHandler(), ChildProcessInfo::RENDER_PROCESS, 0, 0,
-      request_id, "null", "null", ResourceType::MAIN_FRAME,
-      0, false, false, false, -1, -1);
+      request_id, ResourceType::MAIN_FRAME, 0, false, false, false, -1, -1);
 }
 
 // A simple test net::URLRequestJob. We don't care what it does, only that
diff --git a/chrome/browser/load_from_memory_cache_details.cc b/chrome/browser/load_from_memory_cache_details.cc
index 2791020..bf87e06 100644
--- a/chrome/browser/load_from_memory_cache_details.cc
+++ b/chrome/browser/load_from_memory_cache_details.cc
@@ -6,14 +6,10 @@
 
 LoadFromMemoryCacheDetails::LoadFromMemoryCacheDetails(
     const GURL& url,
-    const std::string& frame_origin,
-    const std::string& main_frame_origin,
     int pid,
     int cert_id,
     int cert_status)
     : url_(url),
-      frame_origin_(frame_origin),
-      main_frame_origin_(main_frame_origin),
       pid_(pid),
       cert_id_(cert_id),
       cert_status_(cert_status) {
diff --git a/chrome/browser/load_from_memory_cache_details.h b/chrome/browser/load_from_memory_cache_details.h
index d5ffd1e..da9ca90 100644
--- a/chrome/browser/load_from_memory_cache_details.h
+++ b/chrome/browser/load_from_memory_cache_details.h
@@ -13,24 +13,18 @@ class LoadFromMemoryCacheDetails {
  public:
    LoadFromMemoryCacheDetails(
        const GURL& url,
-       const std::string& frame_origin,
-       const std::string& main_frame_origin,
        int pid,
        int cert_id,
        int cert_status);
   ~LoadFromMemoryCacheDetails();
 
   const GURL& url() const { return url_; }
-  const std::string& frame_origin() const { return frame_origin_; }
-  const std::string& main_frame_origin() const { return main_frame_origin_; }
   int pid() const { return pid_; }
   int ssl_cert_id() const { return cert_id_; }
   int ssl_cert_status() const { return cert_status_; }
 
  private:
   GURL url_;
-  std::string frame_origin_;
-  std::string main_frame_origin_;
   int pid_;
   int cert_id_;
   int cert_status_;
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 5bfe445..25548aa 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -509,8 +509,6 @@ void ResourceDispatcherHost::BeginRequest(
           child_id,
           route_id,
           request_id,
-          request_data.frame_origin,
-          request_data.main_frame_origin,
           request_data.resource_type,
           upload_size,
           false,  // is download
@@ -642,8 +640,6 @@ ResourceDispatcherHost::CreateRequestInfoForBrowserRequest(
                                                child_id,
                                                route_id,
                                                request_id_,
-                                               "null",    // frame_origin
-                                               "null",    // main_frame_origin
                                                ResourceType::SUB_RESOURCE,
                                                0,         // upload_size
                                                download,  // is_download
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.cc b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.cc
index 65f89cb..d324c2a 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.cc
@@ -15,8 +15,6 @@ ResourceDispatcherHostRequestInfo::ResourceDispatcherHostRequestInfo(
     int child_id,
     int route_id,
     int request_id,
-    const std::string& frame_origin,
-    const std::string& main_frame_origin,
     ResourceType::Type resource_type,
     uint64 upload_size,
     bool is_download,
@@ -35,8 +33,6 @@ ResourceDispatcherHostRequestInfo::ResourceDispatcherHostRequestInfo(
       allow_download_(allow_download),
       has_user_gesture_(has_user_gesture),
       pause_count_(0),
-      frame_origin_(frame_origin),
-      main_frame_origin_(main_frame_origin),
       resource_type_(resource_type),
       replace_extension_localization_templates_(false),
       last_load_state_(net::LOAD_STATE_IDLE),
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
index 5c92a45..462e886 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
@@ -36,8 +36,6 @@ class ResourceDispatcherHostRequestInfo : public net::URLRequest::UserData {
       int child_id,
       int route_id,
       int request_id,
-      const std::string& frame_origin,
-      const std::string& main_frame_origin,
       ResourceType::Type resource_type,
       uint64 upload_size,
       bool is_download,
@@ -106,13 +104,6 @@ class ResourceDispatcherHostRequestInfo : public net::URLRequest::UserData {
   int pause_count() const { return pause_count_; }
   void set_pause_count(int count) { pause_count_ = count; }
 
-  // The security origin of the frame making this request.
-  const std::string& frame_origin() const { return frame_origin_; }
-
-  // The security origin of the main frame that contains the frame making
-  // this request.
-  const std::string& main_frame_origin() const { return main_frame_origin_; }
-
   // Identifies the type of resource, such as subframe, media, etc.
   ResourceType::Type resource_type() const { return resource_type_; }
 
@@ -219,8 +210,6 @@ class ResourceDispatcherHostRequestInfo : public net::URLRequest::UserData {
   bool allow_download_;
   bool has_user_gesture_;
   int pause_count_;
-  std::string frame_origin_;
-  std::string main_frame_origin_;
   ResourceType::Type resource_type_;
   bool replace_extension_localization_templates_;
   net::LoadState last_load_state_;
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index bc3ab35..d996f31 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -69,9 +69,6 @@ static ViewHostMsg_Resource_Request CreateResourceRequest(
   request.method = std::string(method);
   request.url = url;
   request.first_party_for_cookies = url;  // bypass third-party cookie blocking
-  // init the rest to default values to prevent getting UMR.
-  request.frame_origin = "null";
-  request.main_frame_origin = "null";
   request.load_flags = 0;
   request.origin_pid = 0;
   request.resource_type = type;
@@ -996,7 +993,6 @@ class ApplyExtensionLocalizationFilterTest : public testing::Test {
   ResourceDispatcherHostRequestInfo* CreateNewResourceRequestInfo() {
     return new ResourceDispatcherHostRequestInfo(
         resource_handler_.get(), ChildProcessInfo::RENDER_PROCESS, 0, 0, 0,
-        "not important", "not important",
         ResourceType::STYLESHEET, 0U, false, false, false, -1, -1);
   }
 
diff --git a/chrome/browser/renderer_host/resource_queue_unittest.cc b/chrome/browser/renderer_host/resource_queue_unittest.cc
index a1a32da..39d831a 100644
--- a/chrome/browser/renderer_host/resource_queue_unittest.cc
+++ b/chrome/browser/renderer_host/resource_queue_unittest.cc
@@ -75,8 +75,7 @@ class DummyResourceHandler : public ResourceHandler {
 ResourceDispatcherHostRequestInfo* GetRequestInfo(int request_id) {
   return new ResourceDispatcherHostRequestInfo(
       new DummyResourceHandler(), ChildProcessInfo::RENDER_PROCESS, 0, 0,
-      request_id, "null", "null", ResourceType::MAIN_FRAME,
-      0, false, false, false, -1, -1);
+      request_id, ResourceType::MAIN_FRAME, 0, false, false, false, -1, -1);
 }
 
 void InitializeQueue(ResourceQueue* queue, ResourceQueueDelegate* delegate) {
diff --git a/chrome/browser/renderer_host/resource_request_details.cc b/chrome/browser/renderer_host/resource_request_details.cc
index 75da0d9..2a6636c 100644
--- a/chrome/browser/renderer_host/resource_request_details.cc
+++ b/chrome/browser/renderer_host/resource_request_details.cc
@@ -23,8 +23,6 @@ ResourceRequestDetails::ResourceRequestDetails(const net::URLRequest* request,
       ResourceDispatcherHost::InfoForRequest(request);
   DCHECK(info);
   resource_type_ = info->resource_type();
-  frame_origin_ = info->frame_origin();
-  main_frame_origin_ = info->main_frame_origin();
 
   // If request is from the worker process on behalf of a renderer, use
   // the renderer process id, since it consumes the notification response
diff --git a/chrome/browser/renderer_host/resource_request_details.h b/chrome/browser/renderer_host/resource_request_details.h
index f11a77a..2cfad35 100644
--- a/chrome/browser/renderer_host/resource_request_details.h
+++ b/chrome/browser/renderer_host/resource_request_details.h
@@ -31,8 +31,6 @@ class ResourceRequestDetails {
   const GURL& original_url() const { return original_url_; }
   const std::string& method() const { return method_; }
   const std::string& referrer() const { return referrer_; }
-  const std::string& frame_origin() const { return frame_origin_; }
-  const std::string& main_frame_origin() const { return main_frame_origin_; }
   bool has_upload() const { return has_upload_; }
   int load_flags() const { return load_flags_; }
   int origin_child_id() const { return origin_child_id_; }
@@ -46,8 +44,6 @@ class ResourceRequestDetails {
   GURL original_url_;
   std::string method_;
   std::string referrer_;
-  std::string frame_origin_;
-  std::string main_frame_origin_;
   bool has_upload_;
   int load_flags_;
   int origin_child_id_;
diff --git a/chrome/browser/ssl/ssl_cert_error_handler.cc b/chrome/browser/ssl/ssl_cert_error_handler.cc
index 97b0e05..a579b13 100644
--- a/chrome/browser/ssl/ssl_cert_error_handler.cc
+++ b/chrome/browser/ssl/ssl_cert_error_handler.cc
@@ -13,12 +13,9 @@ SSLCertErrorHandler::SSLCertErrorHandler(
     ResourceDispatcherHost* rdh,
     net::URLRequest* request,
     ResourceType::Type resource_type,
-    const std::string& frame_origin,
-    const std::string& main_frame_origin,
     int cert_error,
     net::X509Certificate* cert)
-    : SSLErrorHandler(rdh, request, resource_type, frame_origin,
-                      main_frame_origin),
+    : SSLErrorHandler(rdh, request, resource_type),
       cert_error_(cert_error) {
   DCHECK(request == resource_dispatcher_host_->GetURLRequest(request_id_));
 
diff --git a/chrome/browser/ssl/ssl_cert_error_handler.h b/chrome/browser/ssl/ssl_cert_error_handler.h
index 4f71999..fe3782b 100644
--- a/chrome/browser/ssl/ssl_cert_error_handler.h
+++ b/chrome/browser/ssl/ssl_cert_error_handler.h
@@ -24,8 +24,6 @@ class SSLCertErrorHandler : public SSLErrorHandler {
   SSLCertErrorHandler(ResourceDispatcherHost* rdh,
                       net::URLRequest* request,
                       ResourceType::Type resource_type,
-                      const std::string& frame_origin,
-                      const std::string& main_frame_origin,
                       int cert_error,
                       net::X509Certificate* cert);
 
diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc
index 0bc04d8..4d5958b 100644
--- a/chrome/browser/ssl/ssl_error_handler.cc
+++ b/chrome/browser/ssl/ssl_error_handler.cc
@@ -15,16 +15,12 @@
 
 SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
                                  net::URLRequest* request,
-                                 ResourceType::Type resource_type,
-                                 const std::string& frame_origin,
-                                 const std::string& main_frame_origin)
+                                 ResourceType::Type resource_type)
     : manager_(NULL),
       request_id_(0, 0),
       resource_dispatcher_host_(rdh),
       request_url_(request->url()),
       resource_type_(resource_type),
-      frame_origin_(frame_origin),
-      main_frame_origin_(main_frame_origin),
       request_has_been_notified_(false) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h
index 578429c..8d2ffb4 100644
--- a/chrome/browser/ssl/ssl_error_handler.h
+++ b/chrome/browser/ssl/ssl_error_handler.h
@@ -53,12 +53,6 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // Available on either thread.
   ResourceType::Type resource_type() const { return resource_type_; }
 
-  // Available on either thread.
-  const std::string& frame_origin() const { return frame_origin_; }
-
-  // Available on either thread.
-  const std::string& main_frame_origin() const { return main_frame_origin_; }
-
   // Returns the TabContents this object is associated with.  Should be
   // called from the UI thread.
   TabContents* GetTabContents();
@@ -92,9 +86,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // Construct on the IO thread.
   SSLErrorHandler(ResourceDispatcherHost* resource_dispatcher_host,
                   net::URLRequest* request,
-                  ResourceType::Type resource_type,
-                  const std::string& frame_origin,
-                  const std::string& main_frame_origin);
+                  ResourceType::Type resource_type);
 
   virtual ~SSLErrorHandler();
 
@@ -142,14 +134,6 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // This read-only member can be accessed on any thread.
   const ResourceType::Type resource_type_;
 
-  // The origin of the frame associated with this request.
-  // This read-only member can be accessed on any thread.
-  const std::string frame_origin_;
-
-  // The origin of the main frame associated with this request.
-  // This read-only member can be accessed on any thread.
-  const std::string main_frame_origin_;
-
   // A flag to make sure we notify the net::URLRequest exactly once.
   // Should only be accessed on the IO thread
   bool request_has_been_notified_;
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 7d662c0c..c2ec162 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -42,8 +42,6 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
       NewRunnableMethod(new SSLCertErrorHandler(rdh,
                                                 request,
                                                 info->resource_type(),
-                                                info->frame_origin(),
-                                                info->main_frame_origin(),
                                                 cert_error,
                                                 cert),
                         &SSLCertErrorHandler::Dispatch));
@@ -214,8 +212,6 @@ void SSLManager::DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details) {
   scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo(
       details->url(),
       ResourceType::SUB_RESOURCE,
-      details->frame_origin(),
-      details->main_frame_origin(),
       details->pid(),
       details->ssl_cert_id(),
       details->ssl_cert_status()));
@@ -228,8 +224,6 @@ void SSLManager::DidStartResourceResponse(ResourceRequestDetails* details) {
   scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo(
       details->url(),
       details->resource_type(),
-      details->frame_origin(),
-      details->main_frame_origin(),
       details->origin_child_id(),
       details->ssl_cert_id(),
       details->ssl_cert_status()));
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index afe861b..939a7b0 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -103,41 +103,9 @@ void SSLPolicy::OnRequestStarted(SSLRequestInfo* info) {
   // TODO(abarth): This mechanism is wrong.  What we should be doing is sending
   // this information back through WebKit and out some FrameLoaderClient
   // methods.
-  //
-  // The behavior for HTTPS resources with cert errors should be as follows:
-  //   1) If we don't know anything about this host (the one hosting the
-  //      resource), the resource load just fails.
-  //   2) If the user has previously approved the same certificate error for
-  //      this host in a full-page interstitial, then we'll proceed with the
-  //      load.
-  //   3) If we proceed with the load, we should treat the resources as if they
-  //      were loaded over HTTP, w.r.t. the display vs. run distinction above.
-  //
-  // However, right now we don't have the proper context to understand where
-  // these resources will be used.  Consequently, we're conservative and treat
-  // them all like DidRunInsecureContent().
 
-  if (net::IsCertStatusError(info->ssl_cert_status())) {
+  if (net::IsCertStatusError(info->ssl_cert_status()))
     backend_->HostRanInsecureContent(info->url().host(), info->child_id());
-
-    // TODO(abarth): We should eventually remove the main_frame_origin and
-    // frame_origin properties.  First, not every resource load is associated
-    // with a frame, so they don't always make sense.  Second, the
-    // main_frame_origin is computed from the first_party_for_cookies, which has
-    // been hacked to death to support third-party cookie blocking.
-
-    if (info->resource_type() != ResourceType::MAIN_FRAME &&
-        info->resource_type() != ResourceType::SUB_FRAME) {
-      // The frame's origin now contains insecure content.
-      OriginRanInsecureContent(info->frame_origin(), info->child_id());
-    }
-
-    if (info->resource_type() != ResourceType::MAIN_FRAME) {
-      // The main frame now contains a frame with insecure content.  Therefore,
-      // we mark the main frame's origin as broken too.
-      OriginRanInsecureContent(info->main_frame_origin(), info->child_id());
-    }
-  }
 }
 
 void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) {
diff --git a/chrome/browser/ssl/ssl_request_info.cc b/chrome/browser/ssl/ssl_request_info.cc
index 7ba88b0..0647dab 100644
--- a/chrome/browser/ssl/ssl_request_info.cc
+++ b/chrome/browser/ssl/ssl_request_info.cc
@@ -6,15 +6,11 @@
 
 SSLRequestInfo::SSLRequestInfo(const GURL& url,
                                ResourceType::Type resource_type,
-                               const std::string& frame_origin,
-                               const std::string& main_frame_origin,
                                int child_id,
                                int ssl_cert_id,
                                int ssl_cert_status)
     : url_(url),
       resource_type_(resource_type),
-      frame_origin_(frame_origin),
-      main_frame_origin_(main_frame_origin),
       child_id_(child_id),
       ssl_cert_id_(ssl_cert_id),
       ssl_cert_status_(ssl_cert_status) {
diff --git a/chrome/browser/ssl/ssl_request_info.h b/chrome/browser/ssl/ssl_request_info.h
index dc919cd..f65c33d 100644
--- a/chrome/browser/ssl/ssl_request_info.h
+++ b/chrome/browser/ssl/ssl_request_info.h
@@ -19,16 +19,12 @@ class SSLRequestInfo : public base::RefCounted<SSLRequestInfo> {
  public:
   SSLRequestInfo(const GURL& url,
                  ResourceType::Type resource_type,
-                 const std::string& frame_origin,
-                 const std::string& main_frame_origin,
                  int child_id,
                  int ssl_cert_id,
                  int ssl_cert_status);
 
   const GURL& url() const { return url_; }
   ResourceType::Type resource_type() const { return resource_type_; }
-  const std::string& frame_origin() const { return frame_origin_; }
-  const std::string& main_frame_origin() const { return main_frame_origin_; }
   int child_id() const { return child_id_; }
   int ssl_cert_id() const { return ssl_cert_id_; }
   int ssl_cert_status() const { return ssl_cert_status_; }
@@ -40,8 +36,6 @@ class SSLRequestInfo : public base::RefCounted<SSLRequestInfo> {
 
   GURL url_;
   ResourceType::Type resource_type_;
-  std::string frame_origin_;
-  std::string main_frame_origin_;
   int child_id_;
   int ssl_cert_id_;
   int ssl_cert_status_;
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 5810f592..6d5a881 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1598,8 +1598,6 @@ void TabContents::OnDidFailProvisionalLoadWithError(
 
 void TabContents::OnDidLoadResourceFromMemoryCache(
     const GURL& url,
-    const std::string& frame_origin,
-    const std::string& main_frame_origin,
     const std::string& security_info) {
   static base::StatsCounter cache("WebKit.CacheHit");
   cache.Increment();
@@ -1610,9 +1608,8 @@ void TabContents::OnDidLoadResourceFromMemoryCache(
                                       &cert_id, &cert_status,
                                       &security_bits,
                                       &connection_status);
-  LoadFromMemoryCacheDetails details(url, frame_origin, main_frame_origin,
-                                     GetRenderProcessHost()->id(), cert_id,
-                                     cert_status);
+  LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->id(),
+                                     cert_id, cert_status);
 
   NotificationService::current()->Notify(
       NotificationType::LOAD_FROM_MEMORY_CACHE,
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index b101d91..5118fc8 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -762,8 +762,6 @@ class TabContents : public PageNavigator,
                                          const GURL& url,
                                          bool showing_repost_interstitial);
   void OnDidLoadResourceFromMemoryCache(const GURL& url,
-                                        const std::string& frame_origin,
-                                        const std::string& main_frame_origin,
                                         const std::string& security_info);
   void OnDidDisplayInsecureContent();
   void OnDidRunInsecureContent(const std::string& security_origin,
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index b20dc5f..d48dbd5 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1211,10 +1211,8 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_DocumentOnLoadCompletedInMainFrame,
 // The security info is non empty if the resource was originally loaded over
 // a secure connection.
 // Note: May only be sent once per URL per frame per committed load.
-IPC_MESSAGE_ROUTED4(ViewHostMsg_DidLoadResourceFromMemoryCache,
+IPC_MESSAGE_ROUTED2(ViewHostMsg_DidLoadResourceFromMemoryCache,
                     GURL /* url */,
-                    std::string  /* frame_origin */,
-                    std::string  /* main_frame_origin */,
                     std::string  /* security info */)
 
 // Sent when the renderer displays insecure content in a secure page.
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index 3362704..d1a2179 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -920,8 +920,6 @@ void ParamTraits<ViewHostMsg_Resource_Request>::Write(Message* m,
   WriteParam(m, p.url);
   WriteParam(m, p.first_party_for_cookies);
   WriteParam(m, p.referrer);
-  WriteParam(m, p.frame_origin);
-  WriteParam(m, p.main_frame_origin);
   WriteParam(m, p.headers);
   WriteParam(m, p.load_flags);
   WriteParam(m, p.origin_pid);
@@ -943,8 +941,6 @@ bool ParamTraits<ViewHostMsg_Resource_Request>::Read(const Message* m,
       ReadParam(m, iter, &r->url) &&
       ReadParam(m, iter, &r->first_party_for_cookies) &&
       ReadParam(m, iter, &r->referrer) &&
-      ReadParam(m, iter, &r->frame_origin) &&
-      ReadParam(m, iter, &r->main_frame_origin) &&
       ReadParam(m, iter, &r->headers) &&
       ReadParam(m, iter, &r->load_flags) &&
       ReadParam(m, iter, &r->origin_pid) &&
@@ -967,10 +963,6 @@ void ParamTraits<ViewHostMsg_Resource_Request>::Log(const param_type& p,
   l->append(", ");
   LogParam(p.referrer, l);
   l->append(", ");
-  LogParam(p.frame_origin, l);
-  l->append(", ");
-  LogParam(p.main_frame_origin, l);
-  l->append(", ");
   LogParam(p.load_flags, l);
   l->append(", ");
   LogParam(p.origin_pid, l);
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 7bf95e0..0eeaa98 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -442,14 +442,6 @@ struct ViewHostMsg_Resource_Request {
   // The referrer to use (may be empty).
   GURL referrer;
 
-  // The origin of the frame that is associated with this request.  This is used
-  // to update our insecure content state.
-  std::string frame_origin;
-
-  // The origin of the main frame (top-level frame) that is associated with this
-  // request.  This is used to update our insecure content state.
-  std::string main_frame_origin;
-
   // Additional HTTP request headers.
   std::string headers;
 
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 86321b5..5929370 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -102,8 +102,6 @@ IPCResourceLoaderBridge::IPCResourceLoaderBridge(
   request_.url = request_info.url;
   request_.first_party_for_cookies = request_info.first_party_for_cookies;
   request_.referrer = request_info.referrer;
-  request_.frame_origin = request_info.frame_origin;
-  request_.main_frame_origin = request_info.main_frame_origin;
   request_.headers = request_info.headers;
   request_.load_flags = request_info.load_flags;
   request_.origin_pid = request_info.requestor_pid;
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index 3e846f9..09f1fb3 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -156,8 +156,6 @@ class ResourceDispatcherTest : public testing::Test,
     request_info.url = GURL(test_page_url);
     request_info.first_party_for_cookies = GURL(test_page_url);
     request_info.referrer = GURL();
-    request_info.frame_origin = "null";
-    request_info.main_frame_origin = "null";
     request_info.headers = std::string();
     request_info.load_flags = 0;
     request_info.requestor_pid = 0;
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index fcef53c..7a475c2 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -167,8 +167,6 @@ class PluginRequestHandlerProxy
     request_info.first_party_for_cookies =
         GURL(cprequest_->url); // TODO(jackson): policy url?
     request_info.referrer = GURL();  // TODO(mpcomplete): referrer?
-    request_info.frame_origin = "null";
-    request_info.main_frame_origin = "null";
     request_info.headers = extra_headers_;
     request_info.load_flags = load_flags_;
     request_info.requestor_pid = base::GetCurrentProcId();
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 81f0143b..fb63316 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3723,8 +3723,6 @@ void RenderView::didLoadResourceFromMemoryCache(
   Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(
       routing_id_,
       request.url(),
-      frame->securityOrigin().toString().utf8(),
-      frame->top()->securityOrigin().toString().utf8(),
       response.securityInfo()));
 }