Upstreaming chrome/common/chrome_* diff.

base/test/test_support_android.cc

Index: base/test/test_support_android.cc
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index db44cace0b8642970c583757f9caf9e62bb91634..8b512f46d725cbc3e3ba4a7dcbaf5178381bfb8f 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -142,13 +142,11 @@ base::MessagePump* CreateMessagePumpForUIStub() {
 bool GetTestProviderPath(int key, FilePath* result) {
   switch (key) {
     case base::DIR_MODULE: {
-      *result = FilePath(base::android::GetExternalStorageDirectory());
-      return true;
+      return base::android::GetExternalStorageDirectory(result);
     }
     case base::DIR_ANDROID_APP_DATA: {
       // For tests, app data is put in external storage.
-      *result = FilePath(base::android::GetExternalStorageDirectory());
-      return true;
+      return base::android::GetExternalStorageDirectory(result);
     }
     default:
       return false;