Migrate ResourceExtractor.java inside org.chromium.base package.

base/android/java/src/org/chromium/base/ResourceExtractor.java

 // Copyright 2012 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.
 
-package org.chromium.content.browser;
+package org.chromium.base;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 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;
 
 /**
  * Handles extracting the necessary resources bundled in an APK and moving them to a location on
  * the file system accessible from the native code.
  */
 public class ResourceExtractor {
 
@@ skipping 24 matching lines @@
             }
 
             String timestampFile = checkPakTimestamp(outputDir);
             if (timestampFile != null) {
                 deleteFiles();
             }
 
             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)
                     &&  filenames.size() >= sMandatoryPaks.length) {
                 boolean filesPresent = true;
                 for (String file : filenames) {
                     if (!new File(outputDir, file).exists()) {
                         filesPresent = false;
                         break;
                     }
@@ skipping 175 matching lines @@
     }
 
     /**
      * By default the ResourceExtractor will attempt to extract a pak resource for the users
      * currently specified locale. This behavior can be changed with this function and is
      * only needed by tests.
      * @param extract False if we should not attempt to extract a pak file for
      *         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:

setExtractAllPaksForTesting

'collect' is a bit confusing to me and it seems like we should keep the naming
the same.

[vivekg, 2014/09/09 18:01:31]

Sure, how about just having extractAllPaksForTesting as we are not setting any
flag(s) to use 'set' as prefix? WDYT? 

[Ted C, 2014/09/09 18:36:19]

It is not actually extracting anything though, so I think that is also confusing
since you still need to call startExtractingResources.

[vivekg, 2014/09/09 18:46:32]

Your initial proposal of having the name as 'setExtractAllPacksForTesting'
sounds good then. Will change it.

+        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 statements and conditionals on
the same line if they fit, which it will in this case.

if (file.endsWith(".pak")) pakFileAssets.add(file);

[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 as the last param:
http://developer.android.com/reference/android/util/Log.html#w(java.lang.String,
java.lang.String, java.lang.Throwable)

[vivekg, 2014/09/09 18:01:31]

Sure.

+        }
+        setMandatoryPaksToExtract(pakFileAssets.toArray(new String[pakFileAssets.size()]));
+    }
+
     private ResourceExtractor(Context context) {
         mContext = context.getApplicationContext();
     }
 
     public void waitForCompletion() {
         if (shouldSkipPakExtraction()) {
             return;
         }
 
         assert mExtractTask != null;
@@ skipping 62 matching lines @@
     /**
      * Pak extraction not necessarily required by the embedder; we allow them to skip
      * this process if they call setMandatoryPaksToExtract with a single empty String.
      */
     private static boolean shouldSkipPakExtraction() {
         // Must call setMandatoryPaksToExtract before beginning resource extraction.
         assert sMandatoryPaks != null;
         return sMandatoryPaks.length == 1 && "".equals(sMandatoryPaks[0]);
     }
 }