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

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

Issue 12091033: Relanding "Add apk for running content_browsertests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 10 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 | Annotate | Revision Log
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)
9 #include "base/android/jni_android.h"
10 #include "content/browser/android/browser_jni_registrar.h"
11 #include "content/common/android/common_jni_registrar.h"
12 #include "net/android/net_jni_registrar.h"
13 #include "ui/android/ui_jni_registrar.h"
14 #endif
15
16 int main(int argc, char** argv) { 8 int main(int argc, char** argv) {
17
18 #if defined(OS_ANDROID)
19 // Register JNI bindings for android.
20 JNIEnv* env = base::android::AttachCurrentThread();
21 content::android::RegisterCommonJni(env);
22 content::android::RegisterBrowserJni(env);
23 net::android::RegisterJni(env);
24 ui::android::RegisterJni(env);
25 #endif
26
27 return content::UnitTestTestSuite( 9 return content::UnitTestTestSuite(
28 new content::ContentTestSuite(argc, argv)).Run(); 10 new content::ContentTestSuite(argc, argv)).Run();
29 } 11 }
OLDNEW
« no previous file with comments | « content/test/content_test_launcher.cc ('k') | tools/telemetry/telemetry/android_browser_finder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698