Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Unified Diff: base/android/java/src/org/chromium/base/ResourceExtractor.java

Issue 548023002: Migrate ResourceExtractor.java inside org.chromium.base package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved call site changes in this patch. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/java/src/org/chromium/base/ResourceExtractor.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java b/base/android/java/src/org/chromium/base/ResourceExtractor.java
similarity index 93%
rename from content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
rename to base/android/java/src/org/chromium/base/ResourceExtractor.java
index d882f9425a6953ec65ceb3162d540dda992e6b2b..6be810a96bb3864f7513e1c6f83d952eee78b394 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
+++ b/base/android/java/src/org/chromium/base/ResourceExtractor.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.content.browser;
+package org.chromium.base;
import android.content.Context;
import android.content.SharedPreferences;
@@ -13,16 +13,15 @@ import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.util.Log;
-import org.chromium.base.PathUtils;
-import org.chromium.ui.base.LocalizationUtils;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.regex.Pattern;
@@ -67,7 +66,7 @@ public class ResourceExtractor {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
HashSet<String> filenames = (HashSet<String>) prefs.getStringSet(
PAK_FILENAMES, new HashSet<String>());
- String currentLocale = LocalizationUtils.getDefaultLocale();
+ String currentLocale = LocaleUtils.getDefaultLocale();
String currentLanguage = currentLocale.split("-", 2)[0];
if (prefs.getString(LAST_LANGUAGE, "").equals(currentLanguage)
@@ -263,12 +262,33 @@ public class ResourceExtractor {
* the users currently selected locale and try to extract only the
* pak files specified in sMandatoryPaks.
*/
+ @VisibleForTesting
public static void setExtractImplicitLocaleForTesting(boolean extract) {
assert (sInstance == null || sInstance.mExtractTask == null)
: "Must be called before startExtractingResources is called";
sExtractImplicitLocalePak = extract;
}
+ /**
+ * Collect all the 'pak' resources, packaged as assets, for extraction during
+ * running the tests.
+ */
+ @VisibleForTesting
+ public void collectAllPackagedPakAssets() {
Ted C 2014/09/09 17:51:00 I think calling this as: setExtractAllPaksForTest
vivekg 2014/09/09 18:01:31 Sure, how about just having extractAllPaksForTesti
Ted C 2014/09/09 18:36:19 It is not actually extracting anything though, so
vivekg 2014/09/09 18:46:32 Your initial proposal of having the name as 'setEx
+ List<String> pakFileAssets = new ArrayList<String>();
+ AssetManager manager = mContext.getResources().getAssets();
+ try {
+ String[] files = manager.list("");
+ for (String file : files) {
+ if (file.endsWith(".pak"))
+ pakFileAssets.add(file);
Ted C 2014/09/09 17:51:00 braces are always required in java. You can put s
vivekg 2014/09/09 18:01:31 Sure, will change. Thank you.
+ }
+ } catch (IOException e) {
+ Log.w(LOGTAG, "Exception while accessing assets: " + e.getMessage());
Ted C 2014/09/09 17:51:00 Use this version instead that takes the exception
vivekg 2014/09/09 18:01:31 Sure.
+ }
+ setMandatoryPaksToExtract(pakFileAssets.toArray(new String[pakFileAssets.size()]));
+ }
+
private ResourceExtractor(Context context) {
mContext = context.getApplicationContext();
}

Powered by Google App Engine
This is Rietveld 408576698