Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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

Index: base/android/java/src/org/chromium/base/ResourceExtractor.java
diff --git a/base/android/java/src/org/chromium/base/ResourceExtractor.java b/base/android/java/src/org/chromium/base/ResourceExtractor.java
index d44f2fc7c22bdc1697571606c3465a0bc902f3f4..9252b4dd37227fffb6a74fa9b96ee993b80d512e 100644
--- a/base/android/java/src/org/chromium/base/ResourceExtractor.java
+++ b/base/android/java/src/org/chromium/base/ResourceExtractor.java
@@ -12,8 +12,6 @@ import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.Trace;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -59,8 +57,6 @@ public class ResourceExtractor {
     private class ExtractTask extends AsyncTask<Void, Void, Void> {
         private static final int BUFFER_SIZE = 16 * 1024;
 
-        private final List<Runnable> mCompletionCallbacks = new ArrayList<Runnable>();
-
         public ExtractTask() {
         }
 
@@ -215,23 +211,6 @@ public class ResourceExtractor {
             return null;
         }
 
-        private void onPostExecuteImpl() {
-            for (int i = 0; i < mCompletionCallbacks.size(); i++) {
-                mCompletionCallbacks.get(i).run();
-            }
-            mCompletionCallbacks.clear();
-        }
-
-        @Override
-        protected void onPostExecute(Void result) {
-            beginTraceSection("ResourceExtractor.ExtractTask.onPostExecute");
-            try {
-                onPostExecuteImpl();
-            } finally {
-                endTraceSection();
-            }
-        }
-
         // Looks for a timestamp file on disk that indicates the version of the APK that
         // the resource paks were extracted from. Returns null if a timestamp was found
         // and it indicates that the resources match the current APK. Otherwise returns
@@ -356,13 +335,6 @@ public class ResourceExtractor {
         mContext = context.getApplicationContext();
     }
 
-    /**
-     * Synchronously wait for the resource extraction to be completed.
-     * <p>
-     * This method is bad and you should feel bad for using it.
-     *
-     * @see #addCompletionCallback(Runnable)
-     */
     public void waitForCompletion() {
         if (shouldSkipPakExtraction()) {
             return;
@@ -383,35 +355,6 @@ public class ResourceExtractor {
     }
 
     /**
-     * Adds a callback to be notified upon the completion of resource extraction.
-     * <p>
-     * If the resource task has already completed, the callback will be posted to the UI message
-     * queue.  Otherwise, it will be executed after all the resources have been extracted.
-     * <p>
-     * This must be called on the UI thread.  The callback will also always be executed on
-     * the UI thread.
-     *
-     * @param callback The callback to be enqueued.
-     */
-    public void addCompletionCallback(Runnable callback) {
-        ThreadUtils.assertOnUiThread();
-
-        Handler handler = new Handler(Looper.getMainLooper());
-        if (shouldSkipPakExtraction()) {
-            handler.post(callback);
-            return;
-        }
-
-        assert mExtractTask != null;
-        assert !mExtractTask.isCancelled();
-        if (mExtractTask.getStatus() == AsyncTask.Status.FINISHED) {
-            handler.post(callback);
-        } else {
-            mExtractTask.mCompletionCallbacks.add(callback);
-        }
-    }
-
-    /**
      * This will extract the application pak resources in an
      * AsyncTask. Call waitForCompletion() at the point resources
      * are needed to block until the task completes.