summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 17:21:26 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 17:21:26 +0000
commitc0fdf8af4d44f65b90561db2630034575463383e (patch)
tree8ccd88ef8b09be66fb6012b5250fc84cc613664a /net/test
parent855ab43da4bd0342e2b8c9592b52ef80ac0b773f (diff)
downloadchromium_src-c0fdf8af4d44f65b90561db2630034575463383e.zip
chromium_src-c0fdf8af4d44f65b90561db2630034575463383e.tar.gz
chromium_src-c0fdf8af4d44f65b90561db2630034575463383e.tar.bz2
Fix chrome upload with content uri
For android, the upload file dialog returns files with content uri scheme(content://). This CL makes it possible for upload to work with this new file type. It fixes both the form and fileapi based uploads. The CL follows the same code path used by regular file upload and the content url is encompassed by a FilePath object. R=jar@chromium.org, joth@chromium.org, kinuko@chromium.org, mmenke@chromium.org, tsepez@chromium.org TBR=yfriedman BUG=278640 Review URL: https://codereview.chromium.org/46303005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/run_all_unittests.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 3a51ba0..9b5dad2 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -13,6 +13,7 @@
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
+#include "base/test/test_file_util.h"
#include "net/android/net_jni_registrar.h"
#endif
@@ -31,6 +32,7 @@ int main(int argc, char** argv) {
// Register JNI bindings for android. Doing it early as the test suite setup
// may initiate a call to Java.
net::android::RegisterJni(base::android::AttachCurrentThread());
+ file_util::RegisterContentUriTestUtils(base::android::AttachCurrentThread());
#endif
NetTestSuite test_suite(argc, argv);