OLD | NEW |
---|---|
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 "content/test/content_test_suite.h" | 5 #include "content/test/content_test_suite.h" |
6 #include "content/public/test/unittest_test_suite.h" | 6 #include "content/public/test/unittest_test_suite.h" |
7 | 7 |
8 #if defined(OS_ANDROID) | |
9 #include "base/android/jni_android.h" | |
10 #include "content/app/android/content_jni_registrar.h" | |
11 #endif | |
12 | |
8 int main(int argc, char** argv) { | 13 int main(int argc, char** argv) { |
14 | |
15 #if defined(OS_ANDROID) | |
16 // Register JNI bindings for android. | |
17 JNIEnv* env = base::android::AttachCurrentThread(); | |
Jay Civelli
2012/06/26 20:17:11
Nit: do you need a local var?
nilesh
2012/06/26 20:33:54
Removed
| |
18 content::android::RegisterJni(env); | |
19 #endif | |
20 | |
9 return content::UnitTestTestSuite( | 21 return content::UnitTestTestSuite( |
10 new content::ContentTestSuite(argc, argv)).Run(); | 22 new content::ContentTestSuite(argc, argv)).Run(); |
11 } | 23 } |
OLD | NEW |