| Index: base/base_paths_android.cc
 | 
| diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc
 | 
| index f631c611a62313ace242ad55b1c07d06203eda06..ab14ee3ad23b5611fa0b7311647b8fc089377e0a 100644
 | 
| --- a/base/base_paths_android.cc
 | 
| +++ b/base/base_paths_android.cc
 | 
| @@ -2,12 +2,14 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#include "base/base_paths.h"
 | 
| +// Defines base::PathProviderAndroid which replaces base::PathProviderPosix for
 | 
| +// Android in base/path_service.cc.
 | 
|  
 | 
|  #include <unistd.h>
 | 
|  
 | 
|  #include "base/android/jni_android.h"
 | 
|  #include "base/android/path_utils.h"
 | 
| +#include "base/base_paths.h"
 | 
|  #include "base/file_path.h"
 | 
|  #include "base/file_util.h"
 | 
|  #include "base/logging.h"
 | 
| @@ -28,42 +30,38 @@ bool PathProviderAndroid(int key, FilePath* result) {
 | 
|        *result = FilePath(bin_dir);
 | 
|        return true;
 | 
|      }
 | 
| -    case base::FILE_MODULE: {
 | 
| +    case base::FILE_MODULE:
 | 
|        // dladdr didn't work in Android as only the file name was returned.
 | 
|        NOTIMPLEMENTED();
 | 
|        return false;
 | 
| -    }
 | 
| -    case base::DIR_MODULE: {
 | 
| +    case base::DIR_MODULE:
 | 
|        *result = FilePath(base::android::GetNativeLibraryDirectory());
 | 
|        return true;
 | 
| -    }
 | 
| -    case base::DIR_SOURCE_ROOT: {
 | 
| +    case base::DIR_SOURCE_ROOT:
 | 
|        // This const is only used for tests.
 | 
|        *result = FilePath(base::android::GetExternalStorageDirectory());
 | 
|        return true;
 | 
| -    }
 | 
| -    case base::DIR_CACHE: {
 | 
| +    case base::DIR_USER_DESKTOP:
 | 
| +      // Android doesn't support GetUserDesktop.
 | 
| +      NOTIMPLEMENTED();
 | 
| +      return false;
 | 
| +    case base::DIR_CACHE:
 | 
|        *result = FilePath(base::android::GetCacheDirectory());
 | 
|        return true;
 | 
| -    }
 | 
| -    case base::DIR_ANDROID_APP_DATA: {
 | 
| +    case base::DIR_ANDROID_APP_DATA:
 | 
|        *result = FilePath(base::android::GetDataDirectory());
 | 
|        return true;
 | 
| -    }
 | 
| -    case base::DIR_HOME: {
 | 
| +    case base::DIR_HOME:
 | 
|        *result = file_util::GetHomeDir();
 | 
|        return true;
 | 
| -    }
 | 
| -    case base::DIR_ANDROID_EXTERNAL_STORAGE: {
 | 
| +    case base::DIR_ANDROID_EXTERNAL_STORAGE:
 | 
|        *result = FilePath(base::android::GetExternalStorageDirectory());
 | 
|        return true;
 | 
| -    }
 | 
| -    default: {
 | 
| +    default:
 | 
|        // Note: the path system expects this function to override the default
 | 
|        // behavior. So no need to log an error if we don't support a given
 | 
|        // path. The system will just use the default.
 | 
|        return false;
 | 
| -    }
 | 
|    }
 | 
|  }
 | 
|  
 | 
| 
 |