Remove code path that passes a file handle to the renderer...

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 179 matching lines @@
       profile->GetOriginalProfile()->GetRequestContext()->proxy_service();
 
   context->http_transaction_factory_ =
       new net::HttpCache(context->proxy_service_, 0);
   context->cookie_store_ = new net::CookieMonster;
 
   return context;
 }
 
 // static
-ChromeURLRequestContext* ChromeURLRequestContext::CreateOffTheRecordForMedia(
-  Profile* profile, const FilePath& disk_cache_path) {
-  // TODO(hclam): since we don't have an implementation of disk cache backend
-  // for media files in OTR mode, we create a request context just like the
-  // original one.
-  DCHECK(profile->IsOffTheRecord());
-  return CreateRequestContextForMedia(profile, disk_cache_path, true);
-}
-
-// static
 ChromeURLRequestContext*
 ChromeURLRequestContext::CreateOffTheRecordForExtensions(Profile* profile) {
   DCHECK(profile->IsOffTheRecord());
   ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
   context->cookie_store_ = new net::CookieMonster;
 
   // Enable cookies for extension URLs only.
   const char* schemes[] = {chrome::kExtensionScheme};
   context->cookie_store_->SetCookieableSchemes(schemes, 1);
 
   return context;
 }
 
 // static
 ChromeURLRequestContext* ChromeURLRequestContext::CreateRequestContextForMedia(
     Profile* profile, const FilePath& disk_cache_path, bool off_the_record) {
   URLRequestContext* original_context =
       profile->GetOriginalProfile()->GetRequestContext();
   ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
   context->is_media_ = true;
 
   // Share the same proxy service of the common profile.
   context->proxy_service_ = original_context->proxy_service();
   // Also share the cookie store of the common profile.
   context->cookie_store_ = original_context->cookie_store();
 
-  // Create a media cache with maximum size of ~1.8GB, which is a
-  // size cache backend won't complain.
+  // Create a media cache with default size.
   // TODO(hclam): make the maximum size of media cache configurable.
   net::HttpCache* original_cache =
       original_context->http_transaction_factory()->GetCache();
   net::HttpCache* cache;
   if (original_cache) {
     // Try to reuse HttpNetworkSession in the original context, assuming that
     // HttpTransactionFactory (network_layer()) of HttpCache is implemented
     // by HttpNetworkLayer so we can reuse HttpNetworkSession within it. This
     // assumption will be invalid if the original HttpCache is constructed with
     // HttpCache(HttpTransactionFactory*, disk_cache::Backend*) constructor.
     net::HttpNetworkLayer* original_network_layer =
         static_cast<net::HttpNetworkLayer*>(original_cache->network_layer());
     cache = new net::HttpCache(original_network_layer->GetSession(),
-        disk_cache_path.ToWStringHack(), kint32max - kint32max / 10 - 1);
+                               disk_cache_path.ToWStringHack(), 0);
   } else {
     // If original HttpCache doesn't exist, simply construct one with a whole
     // new set of network stack.
     cache = new net::HttpCache(original_context->proxy_service(),
-        disk_cache_path.ToWStringHack(), kint32max - kint32max / 10 - 1);
+                               disk_cache_path.ToWStringHack(), 0);
   }
 
-  // Set the cache type to media.
-  if (off_the_record) {
-    cache->set_type(net::TEMP_MEDIA_CACHE);
-  } else {
-    cache->set_type(net::MEDIA_CACHE);
-  }
-
+  cache->set_type(net::MEDIA_CACHE);
   context->http_transaction_factory_ = cache;
   return context;
 }
 
 ChromeURLRequestContext::ChromeURLRequestContext(Profile* profile)
     : prefs_(profile->GetPrefs()),
       is_media_(false),
       is_off_the_record_(profile->IsOffTheRecord()) {
   // Set up Accept-Language and Accept-Charset header values
   accept_language_ = net::HttpUtil::GenerateAcceptLanguageHeader(
@@ skipping 150 matching lines @@
   // Do not delete the cookie store in the case of the media context, as it is
   // owned by the original context.
   if (!is_media_)
     delete cookie_store_;
 
   // Do not delete the proxy service in the case of OTR or media contexts, as
   // it is owned by the original URLRequestContext.
   if (!is_off_the_record_ && !is_media_)
     delete proxy_service_;
 }