Revert 235752 "Fix chrome upload with content uri"

trunk/src/base/test/run_all_unittests.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #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 {
  public:
   NoAtExitBaseTestSuite(int argc, char** argv)
       : base::TestSuite(argc, argv, false) {
   }
 };
 
 int RunTestSuite(int argc, char** argv) {
   return NoAtExitBaseTestSuite(argc, argv).Run();
 }
 
 }  // 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,
                                argv,
                                base::Bind(&RunTestSuite, argc, argv));
 }