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

4 files changed, 0 insertions, 20 deletions

diff --git a/net/base/load_flags.h b/net/base/load_flags.h
index 7175713..7e3642a 100644
--- a/net/base/load_flags.h
+++ b/net/base/load_flags.h
@@ -37,9 +37,6 @@ enum {
   // If present, upload progress messages should be provided to initiator.
   LOAD_ENABLE_UPLOAD_PROGRESS = 1 << 6,
 
-  // If present, try to download the resource to a standalone file.
-  LOAD_ENABLE_DOWNLOAD_FILE = 1 << 7,
-
   // If present, ignores certificate mismatches with the domain name.
   // (The default behavior is to trigger an OnSSLCertificateError callback.)
   LOAD_IGNORE_CERT_COMMON_NAME_INVALID = 1 << 8,
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index e447031..913dc00 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -606,15 +606,6 @@ void HttpCache::Transaction::SetRequest(const HttpRequestInfo* request) {
   if (cache_->mode() == RECORD)
     effective_load_flags_ |= LOAD_BYPASS_CACHE;
 
-  // If HttpCache has type MEDIA make sure LOAD_ENABLE_DOWNLOAD_FILE is set,
-  // otherwise make sure LOAD_ENABLE_DOWNLOAD_FILE is not set when HttpCache
-  // has type other than MEDIA.
-  if (cache_->type() == HttpCache::MEDIA) {
-    DCHECK(effective_load_flags_ & LOAD_ENABLE_DOWNLOAD_FILE);
-  } else {
-    DCHECK(!(effective_load_flags_ & LOAD_ENABLE_DOWNLOAD_FILE));
-  }
-
   // Some headers imply load flags.  The order here is significant.
   //
   //   LOAD_DISABLE_CACHE   : no cache read or write
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 7fc5e5c..5db229b 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -1225,7 +1225,6 @@ TEST(HttpCache, SimpleGET_MediaCache) {
 #endif
 
   ScopedMockTransaction trans_info(kSimpleGET_Transaction);
-  trans_info.load_flags |= net::LOAD_ENABLE_DOWNLOAD_FILE;
   TestCompletionCallback callback;
 
   {
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index fb25f45..f4aee3a 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -307,13 +307,6 @@ class URLRequest {
     return response_info_.ssl_info;
   }
 
-  // Returns the platform specific file handle for the standalone file that
-  // contains response data. base::kInvalidPlatformFileValue is returned if
-  // such file is not available.
-  base::PlatformFile response_data_file() {
-    return response_info_.response_data_file;
-  }
-
   // Returns the cookie values included in the response, if the request is one
   // that can have cookies.  Returns true if the request is a cookie-bearing
   // type, false otherwise.  This method may only be called once the