Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1036)

Unified Diff: trunk/src/base/test/run_all_unittests.cc

Issue 65043023: Revert 235752 "Fix chrome upload with content uri" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/base/test/data/file_util/red.png ('k') | trunk/src/base/test/test_file_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/base/test/run_all_unittests.cc
===================================================================
--- trunk/src/base/test/run_all_unittests.cc (revision 235758)
+++ trunk/src/base/test/run_all_unittests.cc (working copy)
@@ -7,11 +7,6 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "base/test/test_file_util.h"
-#endif
-
namespace {
class NoAtExitBaseTestSuite : public base::TestSuite {
@@ -28,10 +23,7 @@
} // namespace
int main(int argc, char** argv) {
-#if defined(OS_ANDROID)
- JNIEnv* env = base::android::AttachCurrentThread();
- file_util::RegisterContentUriTestUtils(env);
-#else
+#if !defined(OS_ANDROID)
base::AtExitManager at_exit;
#endif
return base::LaunchUnitTests(argc,
« no previous file with comments | « trunk/src/base/test/data/file_util/red.png ('k') | trunk/src/base/test/test_file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698