Remove "chrome" hardcoded suffix from Android .pak path.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10778023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147043 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 4 deletions

diff --git a/content/content.gyp b/content/content.gyp
index 9695e7e0..e048f8b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -243,6 +243,7 @@
          'type': 'none',
          'dependencies': [
            '../base/base.gyp:base_java',
+           '../net/net.gyp:net_java',
            'content_common',
          ],
          'variables': {
diff --git a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java b/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
index 793f8c1..a01f8d3 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
@@ -13,6 +13,8 @@ import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import org.chromium.base.PathUtils;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
@@ -273,10 +275,7 @@ public class ResourceExtractor {
     }
 
     public static File getOutputDirFromContext(Context context) {
-        // Note that the "chrome" base directory here must match the one in PathUtils.java
-        // and "paks" must match the value used in chrome_paths.cc.
-        // TODO(benm): Clean this up by removing the duplication.
-        return new File(context.getDir("chrome", Context.MODE_PRIVATE), "paks");
+        return new File(PathUtils.getDataDirectory(context.getApplicationContext()), "paks");
     }
 
     public static void deleteFiles(Context context) {
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java
index 72b806b..1cb6cb9 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java
@@ -5,6 +5,8 @@
 package org.chromium.content_shell;
 
 import android.app.Application;
+
+import org.chromium.base.PathUtils;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ResourceExtractor;
 
@@ -16,12 +18,14 @@ public class ContentShellApplication extends Application {
 
     private static final String NATIVE_LIBRARY = "content_shell_content_view";
     private static final String[] MANDATORY_PAK_FILES = new String[] {"content_shell.pak"};
+    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";
 
     @Override
     public void onCreate() {
         super.onCreate();
         ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAK_FILES);
         LibraryLoader.setLibraryToLoad(NATIVE_LIBRARY);
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
     }
 
 }