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

Side by Side Diff: base/test/run_all_unittests.cc

Issue 46303005: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/test/data/file_util/red.png ('k') | base/test/test_file_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/test/launcher/unit_test_launcher.h" 7 #include "base/test/launcher/unit_test_launcher.h"
8 #include "base/test/test_suite.h" 8 #include "base/test/test_suite.h"
9 9
10 #if defined(OS_ANDROID)
11 #include "base/android/jni_android.h"
12 #include "base/test/test_file_util.h"
13 #endif
14
10 namespace { 15 namespace {
11 16
12 class NoAtExitBaseTestSuite : public base::TestSuite { 17 class NoAtExitBaseTestSuite : public base::TestSuite {
13 public: 18 public:
14 NoAtExitBaseTestSuite(int argc, char** argv) 19 NoAtExitBaseTestSuite(int argc, char** argv)
15 : base::TestSuite(argc, argv, false) { 20 : base::TestSuite(argc, argv, false) {
16 } 21 }
17 }; 22 };
18 23
19 int RunTestSuite(int argc, char** argv) { 24 int RunTestSuite(int argc, char** argv) {
20 return NoAtExitBaseTestSuite(argc, argv).Run(); 25 return NoAtExitBaseTestSuite(argc, argv).Run();
21 } 26 }
22 27
23 } // namespace 28 } // namespace
24 29
25 int main(int argc, char** argv) { 30 int main(int argc, char** argv) {
26 #if !defined(OS_ANDROID) 31 #if defined(OS_ANDROID)
32 JNIEnv* env = base::android::AttachCurrentThread();
33 file_util::RegisterContentUriTestUtils(env);
34 #else
27 base::AtExitManager at_exit; 35 base::AtExitManager at_exit;
28 #endif 36 #endif
29 return base::LaunchUnitTests(argc, 37 return base::LaunchUnitTests(argc,
30 argv, 38 argv,
31 base::Bind(&RunTestSuite, argc, argv)); 39 base::Bind(&RunTestSuite, argc, argv));
32 } 40 }
OLDNEW
« no previous file with comments | « base/test/data/file_util/red.png ('k') | base/test/test_file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698