From 606334078cffc3385560da493c7882a3e849bc86 Mon Sep 17 00:00:00 2001
From: "stoyan@chromium.org"
 <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 1 Oct 2010 16:33:37 +0000
Subject: Do not write non-toplevel POST response into the WINInet cache.
 BUG=55918 Review URL: http://codereview.chromium.org/3595004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61184 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/automation/url_request_automation_job.cc | 11 ++++++++++-
 chrome/test/automation/automation_messages.h            |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'chrome')

diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 8e96e7a..e29aa70 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -418,13 +418,22 @@ void URLRequestAutomationJob::StartAsync() {
     referrer = GURL();
   }
 
+  // Get the resource type (main_frame/script/image/stylesheet etc.
+  ResourceDispatcherHostRequestInfo* request_info =
+      ResourceDispatcherHost::InfoForRequest(request_);
+  ResourceType::Type resource_type = ResourceType::MAIN_FRAME;
+  if (request_info) {
+    resource_type = request_info->resource_type();
+  }
+
   // Ask automation to start this request.
   IPC::AutomationURLRequest automation_request = {
     request_->url().spec(),
     request_->method(),
     referrer.spec(),
     new_request_headers.ToString(),
-    request_->get_upload()
+    request_->get_upload(),
+    resource_type
   };
 
   DCHECK(message_filter_);
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index 7f30828..ad6791c 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -301,6 +301,7 @@ struct AutomationURLRequest {
   std::string referrer;
   std::string extra_request_headers;
   scoped_refptr<net::UploadData> upload_data;
+  int resource_type;  // see webkit/glue/resource_type.h
 };
 
 // Traits for AutomationURLRequest structure to pack/unpack.
@@ -313,13 +314,15 @@ struct ParamTraits<AutomationURLRequest> {
     WriteParam(m, p.referrer);
     WriteParam(m, p.extra_request_headers);
     WriteParam(m, p.upload_data);
+    WriteParam(m, p.resource_type);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return ReadParam(m, iter, &p->url) &&
            ReadParam(m, iter, &p->method) &&
            ReadParam(m, iter, &p->referrer) &&
            ReadParam(m, iter, &p->extra_request_headers) &&
-           ReadParam(m, iter, &p->upload_data);
+           ReadParam(m, iter, &p->upload_data) &&
+           ReadParam(m, iter, &p->resource_type);
   }
   static void Log(const param_type& p, std::string* l) {
     l->append("(");
@@ -332,6 +335,8 @@ struct ParamTraits<AutomationURLRequest> {
     LogParam(p.extra_request_headers, l);
     l->append(", ");
     LogParam(p.upload_data, l);
+    l->append(", ");
+    LogParam(p.resource_type, l);
     l->append(")");
   }
 };
-- 
cgit v1.1