summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 18:10:58 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 18:10:58 +0000
commit912bf8a680aa1c0251e55a926168602f0e8b6b9d (patch)
treea656bae670c012aad7b46793627b66bdca3025c8 /net/test
parent16dfd619d06e28297712f315409c34c89d2b46fe (diff)
downloadchromium_src-912bf8a680aa1c0251e55a926168602f0e8b6b9d.zip
chromium_src-912bf8a680aa1c0251e55a926168602f0e8b6b9d.tar.gz
chromium_src-912bf8a680aa1c0251e55a926168602f0e8b6b9d.tar.bz2
Revert 235752 "Fix chrome upload with content uri"
> 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 TBR=qinmin@chromium.org Review URL: https://codereview.chromium.org/65043023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/run_all_unittests.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 9b5dad2..3a51ba0 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -13,7 +13,6 @@
#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
@@ -32,7 +31,6 @@ 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);