Fix an invalid DCHECK for media request context

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 90 matching lines @@
     context->cookie_store_ = new net::CookieMonster(context->cookie_db_.get());
   }
 
   return context;
 }
 
 // static
 ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginalForMedia(
     Profile* profile, const FilePath& disk_cache_path) {
   DCHECK(!profile->IsOffTheRecord());
+  return CreateRequestContextForMedia(profile, disk_cache_path);
+}
+
+// static
+ChromeURLRequestContext* ChromeURLRequestContext::CreateOffTheRecord(
+    Profile* profile) {
+  DCHECK(profile->IsOffTheRecord());
+  ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
+
+  // Share the same proxy service as the original profile. This proxy
+  // service's lifespan is dependent on the lifespan of the original profile,
+  // which we reference (see above).
+  context->proxy_service_ =
+      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);
+}
+
+// static
+ChromeURLRequestContext* ChromeURLRequestContext::CreateRequestContextForMedia(
+    Profile* profile, const FilePath& disk_cache_path) {
   URLRequestContext* original_context =
       profile->GetOriginalProfile()->GetRequestContext();
   ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
   // 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 kint32max (2GB).
   // 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);
+                               disk_cache_path.ToWStringHack(), kint32max);
   } 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);
+                               disk_cache_path.ToWStringHack(), kint32max);
   }
   // Set the cache type to media.
   cache->set_type(net::HttpCache::MEDIA);
 
   context->http_transaction_factory_ = cache;
   return context;
 }
 
-// static
-ChromeURLRequestContext* ChromeURLRequestContext::CreateOffTheRecord(
-    Profile* profile) {
-  DCHECK(profile->IsOffTheRecord());
-  ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
-
-  // Share the same proxy service as the original profile. This proxy
-  // service's lifespan is dependent on the lifespan of the original profile,
-  // which we reference (see above).
-  context->proxy_service_ =
-      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 use the original context first. Change this
-  // to the proper backend later.
-  return CreateOriginalForMedia(profile, disk_cache_path);
-}
-
 ChromeURLRequestContext::ChromeURLRequestContext(Profile* profile)
     : prefs_(profile->GetPrefs()),
       is_off_the_record_(profile->IsOffTheRecord()) {
   // Set up Accept-Language and Accept-Charset header values
   accept_language_ = net::HttpUtil::GenerateAcceptLanguageHeader(
       WideToASCII(prefs_->GetString(prefs::kAcceptLanguages)));
   accept_charset_ = net::HttpUtil::GenerateAcceptCharsetHeader(
       WideToASCII(prefs_->GetString(prefs::kDefaultCharset)));
 
   cookie_policy_.SetType(net::CookiePolicy::FromInt(
@@ skipping 114 matching lines @@
 
   delete cookie_store_;
   delete ftp_transaction_factory_;
   delete http_transaction_factory_;
 
   // Do not delete the proxy service in the case of OTR, as it is owned by the
   // original URLRequestContext.
   if (!is_off_the_record_)
     delete proxy_service_;
 }