Set OS X cache directory to ~/Library/Caches/[app name]/[profile name]

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"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ skipping 78 matching lines @@
 
   // By default we let the cache determine the right size.
   *max_size = 0;
   if (!StringToInt(value, max_size)) {
     *max_size = 0;
   } else if (max_size < 0) {
     *max_size = 0;
   }
 }
 
+FilePath GetCachePath(const FilePath& base) {
+  return base.Append(chrome::kCacheDirname);
+}
+
+FilePath GetMediaCachePath(const FilePath& base) {
+  return base.Append(chrome::kMediaCacheDirname);
+}
+
+bool HasACacheSubdir(const FilePath &dir) {
+  return file_util::PathExists(GetCachePath(dir)) ||
+         file_util::PathExists(GetMediaCachePath(dir));
+}
+
 }  // namespace
 
 // A pointer to the request context for the default profile.  See comments on
 // Profile::GetDefaultRequestContext.
 URLRequestContext* Profile::default_request_context_;
 
 static void CleanupRequestContext(ChromeURLRequestContext* context) {
   if (context) {
     context->CleanupOnUIThread();
 
@@ skipping 461 matching lines @@
     std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue(
         switches::kPrivacyBlacklist);
 #if defined(OS_POSIX)
     FilePath path(WideToUTF8(option));
 #else
     FilePath path(option);
 #endif
     blacklist_ = new Blacklist(path);
   }
 
+#if defined(OS_MACOSX)
+  // If the profile directory doesn't already have a cache directory and it
+  // is under ~/Library/Application Support, use a suitable cache directory
+  // under ~/Library/Caches.  For example, a profile directory of
+  // ~/Library/Application Support/Google/Chrome/MyProfileName that doesn't
+  // have a "Cache" or "MediaCache" subdirectory would use the cache directory
+  // ~/Library/Caches/Google/Chrome/MyProfileName.
+  //
+  // TODO(akalin): Come up with unit tests for this.
+  // TODO(akalin): Use for Linux, too?
+  if (!HasACacheSubdir(path_)) {
+    FilePath app_data_path, user_cache_path;
+    if (PathService::Get(base::DIR_APP_DATA, &app_data_path) &&
+        PathService::Get(base::DIR_CACHE, &user_cache_path) &&
+        app_data_path.AppendRelativePath(path_, &user_cache_path)) {
+      base_cache_path_ = user_cache_path;
+    }
+  }
+#else
   if (!PathService::IsOverridden(chrome::DIR_USER_DATA))
     PathService::Get(chrome::DIR_USER_CACHE, &base_cache_path_);
+#endif
   if (base_cache_path_.empty())
     base_cache_path_ = path_;
 
   // Listen for theme installation.
   registrar_.Add(this, NotificationType::THEME_INSTALLED,
                  NotificationService::AllSources());
 
   // Listen for bookmark model load, to bootstrap the sync service.
   registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED,
                  Source<Profile>(this));
@@ skipping 283 matching lines @@
 }
 
 URLRequestContext* ProfileImpl::GetRequestContext() {
   if (!request_context_) {
     FilePath cookie_path = GetPath();
     cookie_path = cookie_path.Append(chrome::kCookieFilename);
     FilePath cache_path = base_cache_path_;
     int max_size;
     GetCacheParameters(kNormalContext, &cache_path, &max_size);
 
-    cache_path = cache_path.Append(chrome::kCacheDirname);
+    cache_path = GetCachePath(cache_path);
     request_context_ = ChromeURLRequestContext::CreateOriginal(
         this, cookie_path, cache_path, max_size);
     request_context_->AddRef();
 
     // The first request context is always a normal (non-OTR) request context.
     // Even when Chromium is started in OTR mode, a normal profile is always
     // created first.
     if (!default_request_context_) {
       default_request_context_ = request_context_;
       NotificationService::current()->Notify(
@@ skipping 10 matching lines @@
 
   return request_context_;
 }
 
 URLRequestContext* ProfileImpl::GetRequestContextForMedia() {
   if (!media_request_context_) {
     FilePath cache_path = base_cache_path_;
     int max_size;
     GetCacheParameters(kMediaContext, &cache_path, &max_size);
 
-    cache_path = cache_path.Append(chrome::kMediaCacheDirname);
+    cache_path = GetMediaCachePath(cache_path);
     media_request_context_ = ChromeURLRequestContext::CreateOriginalForMedia(
         this, cache_path, max_size);
     media_request_context_->AddRef();
 
     DCHECK(media_request_context_->cookie_store());
   }
 
   return media_request_context_;
 }
 
@@ skipping 401 matching lines @@
 #endif
   return NULL;
 }
 
 void ProfileImpl::InitSyncService() {
 #ifdef CHROME_PERSONALIZATION
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 #endif
 }