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

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

Issue 10805019: Add net library for content unit test and enable related test cases on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add dependency to net_java Created 8 years, 5 months 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
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | 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 "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) 8 #if defined(OS_ANDROID)
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "content/browser/android/browser_jni_registrar.h" 10 #include "content/browser/android/browser_jni_registrar.h"
11 #include "content/common/android/common_jni_registrar.h" 11 #include "content/common/android/common_jni_registrar.h"
12 #include "net/android/net_jni_registrar.h"
12 #endif 13 #endif
13 14
14 int main(int argc, char** argv) { 15 int main(int argc, char** argv) {
15 16
16 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
17 // Register JNI bindings for android. 18 // Register JNI bindings for android.
18 JNIEnv* env = base::android::AttachCurrentThread(); 19 JNIEnv* env = base::android::AttachCurrentThread();
19 content::android::RegisterCommonJni(env); 20 content::android::RegisterCommonJni(env);
20 content::android::RegisterBrowserJni(env); 21 content::android::RegisterBrowserJni(env);
22 net::android::RegisterJni(env);
21 #endif 23 #endif
22 24
23 return content::UnitTestTestSuite( 25 return content::UnitTestTestSuite(
24 new content::ContentTestSuite(argc, argv)).Run(); 26 new content::ContentTestSuite(argc, argv)).Run();
25 } 27 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698