Fix bug 9094

chrome/browser/profile.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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 196 matching lines @@
     return (download_manager_.get() != NULL);
   }
 
   virtual URLRequestContext* GetRequestContext() {
     return request_context_;
   }
 
   virtual URLRequestContext* GetRequestContextForMedia() {
     if (!media_request_context_) {
       FilePath cache_path = GetPath();
+
+      // Override the cache location if specified by the user.
+      const std::wstring user_cache_dir(
+          CommandLine::ForCurrentProcess()->GetSwitchValue(
+              switches::kDiskCacheDir));
+      if (!user_cache_dir.empty()) {
+        cache_path = FilePath::FromWStringHack(user_cache_dir);
+      }
+
       cache_path.Append(chrome::kOffTheRecordMediaCacheDirname);
       media_request_context_ =
           ChromeURLRequestContext::CreateOffTheRecordForMedia(
               this, cache_path);
       media_request_context_->AddRef();
 
       DCHECK(media_request_context_->cookie_store());
     }
     return media_request_context_;
   }
@@ skipping 383 matching lines @@
 
     DCHECK(request_context_->cookie_store());
   }
 
   return request_context_;
 }
 
 URLRequestContext* ProfileImpl::GetRequestContextForMedia() {
   if (!media_request_context_) {
     FilePath cache_path = GetPath();
+
+    // Override the cache location if specified by the user.
+    const std::wstring user_cache_dir(
+        CommandLine::ForCurrentProcess()->GetSwitchValue(
+            switches::kDiskCacheDir));
+    if (!user_cache_dir.empty()) {
+      cache_path = FilePath::FromWStringHack(user_cache_dir);
+    }
+
     cache_path.Append(chrome::kMediaCacheDirname);
     media_request_context_ = ChromeURLRequestContext::CreateOriginalForMedia(
         this, cache_path);
     media_request_context_->AddRef();
 
     DCHECK(media_request_context_->cookie_store());
   }
 
   return media_request_context_;
 }
@@ skipping 244 matching lines @@
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   DCHECK(!Personalization::IsP13NDisabled());
   if (!personalization_.get())
     personalization_.reset(
         Personalization::CreateProfilePersonalization(this));
   return personalization_.get();
 }
 #endif