[aw] Reorganize profile data on disk.

Set CACHE_DIR to WV-specific directory (WebView).
Folders under app_webview are moved into app_webview/Default.

HTTP Cache under cache/org.chromium.android_webview is moved into
cache/WebView/Default/HTTP Cache.

Bug: 963875
Change-Id: Ifa150fe0a40a775bc1705e1ac4ea355e67dbee0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793087
Commit-Queue: Anna Malova <amalova@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702833}

android_webview/apk/java/src/com/android/webview/chromium/WebViewApkApplication.java

@@ -58,7 +58,7 @@ public class WebViewApkApplication extends Application {
         // Either "webview_service", or "webview_apk".
         // "webview_service" is meant to be very light-weight and never load the native library.
         if (ContextUtils.getProcessName().contains(":webview_")) {
-            PathUtils.setPrivateDataDirectorySuffix("webview");
+            PathUtils.setPrivateDataDirectorySuffix("webview", "WebView");
             CommandLineUtil.initCommandLine();
         }
     }

android_webview/browser/aw_browser_context.cc

@@ -25,6 +25,7 @@
 #include "base/base_paths_posix.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task/post_task.h"
@@ -76,12 +77,56 @@ bool IgnoreOriginSecurityCheck(const GURL& url) {
   return true;
 }
 
+void MigrateProfileData(base::FilePath cache_path,
+                        base::FilePath context_storage_path) {
+  FilePath old_cache_path;
+  base::PathService::Get(base::DIR_CACHE, &old_cache_path);
+  old_cache_path = old_cache_path.DirName().Append(
+      FILE_PATH_LITERAL("org.chromium.android_webview"));
+
+  if (!base::PathExists(old_cache_path))
+    return;
+
+  bool success = base::CreateDirectory(cache_path);
+  if (success)
+    success &= base::Move(old_cache_path, cache_path);
+  DCHECK(success);
+
+  base::FilePath old_context_storage_path;
+  base::PathService::Get(base::DIR_ANDROID_APP_DATA, &old_context_storage_path);
+
+  if (!base::PathExists(context_storage_path)) {
+    base::CreateDirectory(context_storage_path);
+  }
+
+  auto migrate_context_storage_data = [&old_context_storage_path,
+                                       &context_storage_path](auto& suffix) {
+    if (base::PathExists(old_context_storage_path.Append(suffix))) {
+      bool success = base::Move(old_context_storage_path.Append(suffix),
+                                context_storage_path.Append(suffix));
+
+      DCHECK(success);
+    }
+  };
+
+  migrate_context_storage_data("Web Data");
+  migrate_context_storage_data("Web Data-journal");
+  migrate_context_storage_data("GPUCache");
+  migrate_context_storage_data("blob_storage");
+  migrate_context_storage_data("Session Storage");
+}
+
 }  // namespace
 
 AwBrowserContext::AwBrowserContext()
     : context_storage_path_(GetContextStoragePath()),
       simple_factory_key_(GetPath(), IsOffTheRecord()) {
   DCHECK(!g_browser_context);
+
+  if (IsDefaultBrowserContext()) {
+    MigrateProfileData(GetCacheDir(), GetContextStoragePath());
+  }
+
   g_browser_context = this;
   SimpleKeyMap::GetInstance()->Associate(this, &simple_factory_key_);
 
@@ -131,8 +176,8 @@ base::FilePath AwBrowserContext::GetCacheDir() {
   if (!base::PathService::Get(base::DIR_CACHE, &cache_path)) {
     NOTREACHED() << "Failed to get app cache directory for Android WebView";
   }
-  cache_path =
-      cache_path.Append(FILE_PATH_LITERAL("org.chromium.android_webview"));
+  cache_path = cache_path.Append(FILE_PATH_LITERAL("Default"))
+                   .Append(FILE_PATH_LITERAL("HTTP Cache"));
   return cache_path;
 }
 
@@ -158,6 +203,7 @@ base::FilePath AwBrowserContext::GetContextStoragePath() {
     NOTREACHED() << "Failed to get app data directory for Android WebView";
   }
 
+  user_data_dir = user_data_dir.Append(FILE_PATH_LITERAL("Default"));
   return user_data_dir;
 }
 

android_webview/common/aw_paths.cc

@@ -18,14 +18,12 @@ bool PathProvider(int key, base::FilePath* result) {
     case DIR_CRASH_DUMPS:
       if (!base::android::GetCacheDirectory(&cur))
         return false;
-      cur = cur.Append(FILE_PATH_LITERAL("WebView"))
-                .Append(FILE_PATH_LITERAL("Crashpad"));
+      cur = cur.Append(FILE_PATH_LITERAL("Crashpad"));
       break;
     case DIR_SAFE_BROWSING:
       if (!base::android::GetCacheDirectory(&cur))
         return false;
-      cur = cur.Append(FILE_PATH_LITERAL("WebView"))
-                .Append(FILE_PATH_LITERAL("SafeBrowsing"));
+      cur = cur.Append(FILE_PATH_LITERAL("SafeBrowsing"));
       break;
     default:
       return false;

android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java

@@ -76,7 +76,7 @@ public final class AwBrowserProcess {
      */
     public static void loadLibrary(String processDataDirSuffix) {
         if (processDataDirSuffix == null) {
-            PathUtils.setPrivateDataDirectorySuffix(WEBVIEW_DIR_BASENAME, null);
+            PathUtils.setPrivateDataDirectorySuffix(WEBVIEW_DIR_BASENAME, "WebView");
         } else {
             String processDataDirName = WEBVIEW_DIR_BASENAME + "_" + processDataDirSuffix;
             PathUtils.setPrivateDataDirectorySuffix(processDataDirName, processDataDirName);

android_webview/javatests/src/org/chromium/android_webview/test/OnDiskFileTest.java

@@ -44,7 +44,7 @@ public class OnDiskFileTest {
                                                 .getTargetContext()
                                                 .getCacheDir()
                                                 .getPath(),
-                "org.chromium.android_webview");
+                "WebView/Default/HTTP Cache");
         FileUtils.recursivelyDeleteFile(webViewCacheDir);
 
         mActivityTestRule.startBrowserProcess();

android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java

@@ -23,7 +23,7 @@ public class AwShellApplication extends Application {
     protected void attachBaseContext(Context context) {
         super.attachBaseContext(context);
         ContextUtils.initApplicationContext(this);
-        PathUtils.setPrivateDataDirectorySuffix("webview");
+        PathUtils.setPrivateDataDirectorySuffix("webview", "WebView");
         CommandLine.initFromFile("/data/local/tmp/android-webview-command-line");
         ResourceBundle.setAvailablePakLocales(
                 new String[] {}, AwLocaleConfig.getWebViewSupportedPakLocales());