summaryrefslogtreecommitdiffstats
path: root/chrome/common/render_messages.h
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 15:38:46 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 15:38:46 +0000
commitbd328ad5f82d9d7d3bbd45d98c5e38e13044b82b (patch)
treec2df040de05b1433002c9c21a8de600de10704b8 /chrome/common/render_messages.h
parent15e18c0f131d39d2e3817aa3f830c7acb1ad9eba (diff)
downloadchromium_src-bd328ad5f82d9d7d3bbd45d98c5e38e13044b82b.zip
chromium_src-bd328ad5f82d9d7d3bbd45d98c5e38e13044b82b.tar.gz
chromium_src-bd328ad5f82d9d7d3bbd45d98c5e38e13044b82b.tar.bz2
Revert change 10975 and 10972 because it broke the purify
tests, and it might have caused a unit tests failure. purify error : UMR in URLRequest::response_data_file failing test: URLFetcherHeadersTest.Headers: c:\b\slave\chromium-rel-builder\build\src\chrome\browser\net\url_fetcher_unittest.cc(222): error: Value of: source->response_headers()->GetNormalizedHeader("cache-control", &header) Actual: false Expected: true c:\b\slave\chromium-rel-builder\build\src\chrome\browser\net\url_fetcher_unittest.cc(223): error: Value of: header Actual: "" Expected: "private" c:\b\slave\chromium-rel-builder\build\src\chrome\browser\net\url_fetcher_unittest.cc(181): error: Value of: response_code Actual: 404 Expected: 200 Release only. Review URL: http://codereview.chromium.org/39191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages.h')
-rwxr-xr-xchrome/common/render_messages.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 6258f37..582bf3a 100755
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -377,9 +377,6 @@ struct ParamTraits<ResourceType::Type> {
case ResourceType::OBJECT:
type = L"OBJECT";
break;
- case ResourceType::MEDIA:
- type = L"MEDIA";
- break;
default:
type = L"UNKNOWN";
break;
@@ -1337,14 +1334,12 @@ struct ParamTraits<ResourceResponseHead> {
ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Write(m, p);
WriteParam(m, p.status);
WriteParam(m, p.filter_policy);
- WriteParam(m, p.response_data_file);
}
static bool Read(const Message* m, void** iter, param_type* r) {
return
ParamTraits<webkit_glue::ResourceLoaderBridge::ResponseInfo>::Read(m, iter, r) &&
ReadParam(m, iter, &r->status) &&
- ReadParam(m, iter, &r->filter_policy) &&
- ReadParam(m, iter, &r->response_data_file);
+ ReadParam(m, iter, &r->filter_policy);
}
static void Log(const param_type& p, std::wstring* l) {
// log more?