Update to Chromium //base at Chromium commit e3a753f17bac62738b0dbf0b36510f767b081e4b.

android/java/src/org/chromium/base/PathUtils.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.base;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.AsyncTask;
 import android.os.Environment;
 
 import org.chromium.base.annotations.CalledByNative;
 
 import java.io.File;
 import java.util.concurrent.ExecutionException;
 
 /**
  * This class provides the path related methods for the native library.
  */
 public abstract class PathUtils {
     private static final String THUMBNAIL_DIRECTORY = "textures";
 
     private static final int DATA_DIRECTORY = 0;
     private static final int DATABASE_DIRECTORY = 1;
     private static final int CACHE_DIRECTORY = 2;
-    private static final int DOWNLOADS_DIRECTORY = 3;
-    private static final int NUM_DIRECTORIES = 4;
+    private static final int NUM_DIRECTORIES = 3;
     private static AsyncTask<String, Void, String[]> sDirPathFetchTask;
 
     private static File sThumbnailDirectory;
 
     // Prevent instantiation.
     private PathUtils() {}
 
     /**
      * Starts an asynchronous task to fetch the path of the directory where private data is to be
      * stored by the application.
      *
      * @param suffix The private data directory suffix.
      * @see Context#getDir(String, int)
      */
     public static void setPrivateDataDirectorySuffix(String suffix, Context context) {
         final Context appContext = context.getApplicationContext();
         sDirPathFetchTask = new AsyncTask<String, Void, String[]>() {
             @Override
             protected String[] doInBackground(String... dataDirectorySuffix) {
                 String[] paths = new String[NUM_DIRECTORIES];
                 paths[DATA_DIRECTORY] =
                         appContext.getDir(dataDirectorySuffix[0], Context.MODE_PRIVATE).getPath();
                 paths[DATABASE_DIRECTORY] = appContext.getDatabasePath("foo").getParent();
                 // TODO(wnwen): Find a way to avoid calling this function in renderer process.
                 if (appContext.getCacheDir() != null) {
-                    // These paths are only available in the browser process.
                     paths[CACHE_DIRECTORY] = appContext.getCacheDir().getPath();
-                    paths[DOWNLOADS_DIRECTORY] = Environment
-                                                         .getExternalStoragePublicDirectory(
-                                                                 Environment.DIRECTORY_DOWNLOADS)
-                                                         .getPath();
                 }
                 return paths;
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, suffix);
     }
 
     /**
      * @param index The index of the cached directory path.
      * @return The directory path requested, or null if not available.
      */
@@ skipping 45 matching lines @@
     public static String getThumbnailCacheDirectoryPath(Context appContext) {
         return getThumbnailCacheDirectory(appContext).getAbsolutePath();
     }
 
     /**
      * @return the public downloads directory.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private static String getDownloadsDirectory(Context appContext) {
-        assert sDirPathFetchTask != null : "setDataDirectorySuffix must be called first.";
-        return getDirectoryPath(DOWNLOADS_DIRECTORY);
+        return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                .getPath();
     }
 
     /**
      * @return the path to native libraries.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private static String getNativeLibraryDirectory(Context appContext) {
         ApplicationInfo ai = appContext.getApplicationInfo();
         if ((ai.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0
                 || (ai.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
             return ai.nativeLibraryDir;
         }
 
         return "/system/lib/";
     }
 
     /**
      * @return the external storage directory.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     public static String getExternalStorageDirectory() {
         return Environment.getExternalStorageDirectory().getAbsolutePath();
     }
 }