summaryrefslogtreecommitdiffstats
path: root/chrome/browser
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/browser
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/browser')
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host.cc9
-rw-r--r--chrome/browser/renderer_host/resource_handler.h19
2 files changed, 0 insertions, 28 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 6f13305..ba161e4 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -815,15 +815,6 @@ bool ResourceDispatcherHost::CompleteResponseStarted(URLRequest* request) {
response->response_head.content_length = request->GetExpectedContentSize();
request->GetMimeType(&response->response_head.mime_type);
- // Structure of ResourceResponseHead depends on the platform, so we do it
- // differently.
-#if defined(OS_POSIX)
- response->response_head.response_data_file.fd = request->response_data_file();
- response->response_head.response_data_file.auto_close = false;
-#elif defined(OS_WIN)
- response->response_head.response_data_file = request->response_data_file();
-#endif
-
if (request->ssl_info().cert) {
int cert_id =
CertStore::GetSharedInstance()->StoreCert(
diff --git a/chrome/browser/renderer_host/resource_handler.h b/chrome/browser/renderer_host/resource_handler.h
index 1ea5a55..01abcb5 100644
--- a/chrome/browser/renderer_host/resource_handler.h
+++ b/chrome/browser/renderer_host/resource_handler.h
@@ -12,11 +12,6 @@
#ifndef CHROME_BROWSER_RENDERER_HOST_RESOURCE_HANDLER_H_
#define CHROME_BROWSER_RENDERER_HOST_RESOURCE_HANDLER_H_
-#include "build/build_config.h"
-#if defined(OS_POSIX)
-#include "base/file_descriptor_posix.h"
-#endif
-#include "base/platform_file.h"
#include "chrome/common/filter_policy.h"
#include "net/url_request/url_request_status.h"
#include "webkit/glue/resource_loader_bridge.h"
@@ -34,20 +29,6 @@ struct ResourceResponseHead
// Specifies if the resource should be filtered before being displayed
// (insecure resources can be filtered to keep the page secure).
FilterPolicy::Type filter_policy;
-
- // A platform specific handle for a file that carries response data. This
- // entry is used if the resource request is of type ResourceType::MEDIA and
- // the underlying cache layer keeps the response data in a standalone file.
-#if defined(OS_POSIX)
- // If the response data file is available, the file handle is stored in
- // response_data_file.fd, its value is base::kInvalidPlatformFileValue
- // otherwise.
- base::FileDescriptor response_data_file;
-#elif defined(OS_WIN)
- // An asynchronous file handle to the response data file, its value is
- // base::kInvalidPlatformFileValue if the file is not available.
- base::PlatformFile response_data_file;
-#endif
};
// Parameters for a synchronous resource response.