Merge lp:~osomon/oxide/simple-cache-backend into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Use the simple backend for network and application caches.

[lp:~osomon/oxide/simple-cache-backend]

1015. By Olivier Tilloy on 2015-04-01

No need for a patch.

1016. By Olivier Tilloy on 2015-04-09

Create a new network cache in a different place.

1017. By Olivier Tilloy on 2015-04-09

Use available constant for app cache directory name.

1018. By Olivier Tilloy on 2015-04-09

Clear the app cache on the FILE thread.

[Chris Coulson (chrisccoulson)]

I think this mostly looks ok - the only thing I am concerned about is that clearing the appcache might be racey. So we can get this in to 1.7, I wonder whether we should just switch the network cache for now (given that's the problematic one) and then look at the application cache in 1.8. WDYT?

[lp:~osomon/oxide/simple-cache-backend]

1019. By Olivier Tilloy on 2015-04-15

Revert the changes to the app cache for now.

[Olivier Tilloy (osomon)]

Yeah, let’s switch only the network cache for now. I updated the MR to revert the appcache changes.

[Chris Coulson (chrisccoulson)]

Thanks, this looks fine

review: Approve

=== modified file 'shared/browser/oxide_browser_context.cc'
--- shared/browser/oxide_browser_context.cc	2015-03-31 16:47:42 +0000
+++ shared/browser/oxide_browser_context.cc	2015-04-15 17:01:35 +0000
@@ -85,7 +85,11 @@
 
 base::LazyInstance<std::vector<BrowserContext *> > g_all_contexts;
 
+// Cache was used for the default blockfile backend (CACHE_BACKEND_BLOCKFILE),
+// Cache2 is used since the switch to the simple backend (CACHE_BACKEND_SIMPLE).
 const base::FilePath::CharType kCacheDirname[] = FILE_PATH_LITERAL("Cache");
+const base::FilePath::CharType kCacheDirname2[] = FILE_PATH_LITERAL("Cache2");
+
 const base::FilePath::CharType kCookiesFilename[] =
     FILE_PATH_LITERAL("cookies.sqlite");
 
@@ -100,22 +104,17 @@
 const char kDevtoolsDefaultServerIp[] = "127.0.0.1";
 const int kBackLog = 1;
 
-void CleanupGPUShaderCache(const base::FilePath& path) {
-  base::FilePath cache = path.Append(FILE_PATH_LITERAL("GPUCache"));
-  if (!base::DirectoryExists(cache)) {
+void CleanupOldCacheDir(const base::FilePath& path) {
+  if (!base::DirectoryExists(path)) {
     return;
   }
 
   base::FileEnumerator traversal(
-      cache, false,
+      path, false,
       base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
   for (base::FilePath current = traversal.Next(); !current.empty();
        current = traversal.Next()) {
     if (traversal.GetInfo().IsDirectory()) {
-      LOG(WARNING)
-          << "Not deleting GPU shader cache directory \"" << cache.value()
-          << "\". Directory contains an unexpected sub-directory \""
-          << traversal.GetInfo().GetName().value() << "\"";
       return;
     }
 
@@ -123,14 +122,11 @@
     if (name != FILE_PATH_LITERAL("index") &&
         name.compare(0, 5, FILE_PATH_LITERAL("data_")) != 0 &&
         name.compare(0, 2, FILE_PATH_LITERAL("f_")) != 0) {
-      LOG(WARNING)
-          << "Not deleting GPU shader cache directory \"" << cache.value()
-          << "\". Directory contains an unexpected file \"" << name << "\"";
       return;
     }
   }
 
-  base::DeleteFile(cache, true);
+  base::DeleteFile(path, true);
 }
 
 } // namespace
@@ -495,14 +491,21 @@
 
   context->set_transport_security_state(transport_security_state_.get());
 
+  // Run-once code that is run when upgrading oxide to
+  // a version that uses the simple cache backend.
+  content::BrowserThread::PostTask(
+      content::BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(&CleanupOldCacheDir, GetCachePath().Append(kCacheDirname)));
+
   net::HttpCache::BackendFactory* cache_backend = nullptr;
   if (IsOffTheRecord() || GetCachePath().empty()) {
     cache_backend = net::HttpCache::DefaultBackend::InMemory(0);
   } else {
     cache_backend = new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
-          net::CACHE_BACKEND_DEFAULT,
-          GetCachePath().Append(kCacheDirname),
+          net::CACHE_BACKEND_SIMPLE,
+          GetCachePath().Append(kCacheDirname2),
           GetMaxCacheSizeHint() * 1024 * 1024, // MB -> bytes
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::CACHE));
@@ -717,10 +720,11 @@
   }
 
   if (!GetPath().empty()) {
+    base::FilePath gpu_cache = GetPath().Append(FILE_PATH_LITERAL("GPUCache"));
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE,
         FROM_HERE,
-        base::Bind(&CleanupGPUShaderCache, GetPath()));
+        base::Bind(&CleanupOldCacheDir, gpu_cache));
   }
 }