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

Side by Side Diff: content/app/android/library_loader_hooks.cc

Issue 10697030: Register JNI for content_unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 | 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/public/app/android_library_loader_hooks.h" 5 #include "content/public/app/android_library_loader_hooks.h"
6 6
7 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/at_exit.h" 11 #include "base/at_exit.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/debug/trace_event.h" 13 #include "base/debug/trace_event.h"
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/string_tokenizer.h" 17 #include "base/string_tokenizer.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/tracked_objects.h" 19 #include "base/tracked_objects.h"
20 #include "content/app/android/content_jni_registrar.h" 20 #include "content/app/android/app_jni_registrar.h"
21 #include "content/browser/android/browser_jni_registrar.h"
22 #include "content/common/android/common_jni_registrar.h"
21 #include "content/common/android/command_line.h" 23 #include "content/common/android/command_line.h"
22 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
23 #include "media/base/android/media_jni_registrar.h" 25 #include "media/base/android/media_jni_registrar.h"
24 #include "net/android/net_jni_registrar.h" 26 #include "net/android/net_jni_registrar.h"
25 #include "jni/library_loader_jni.h" 27 #include "jni/library_loader_jni.h"
26 28
27 namespace { 29 namespace {
28 base::AtExitManager* g_at_exit_manager = NULL; 30 base::AtExitManager* g_at_exit_manager = NULL;
29 } 31 }
30 32
(...skipping 26 matching lines...) Expand all
57 false); // Tick count 59 false); // Tick count
58 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 60 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
59 << ", default verbosity = " << logging::GetVlogVerbosity(); 61 << ", default verbosity = " << logging::GetVlogVerbosity();
60 62
61 if (!base::android::RegisterJni(env)) 63 if (!base::android::RegisterJni(env))
62 return JNI_FALSE; 64 return JNI_FALSE;
63 65
64 if (!net::android::RegisterJni(env)) 66 if (!net::android::RegisterJni(env))
65 return JNI_FALSE; 67 return JNI_FALSE;
66 68
67 if (!content::android::RegisterJni(env)) 69 if (!content::android::RegisterCommonJni(env))
70 return JNI_FALSE;
71
72 if (!content::android::RegisterBrowserJni(env))
73 return JNI_FALSE;
74
75 if (!content::android::RegisterAppJni(env))
68 return JNI_FALSE; 76 return JNI_FALSE;
69 77
70 if (!media::RegisterJni(env)) 78 if (!media::RegisterJni(env))
71 return JNI_FALSE; 79 return JNI_FALSE;
72 80
73 return JNI_TRUE; 81 return JNI_TRUE;
74 } 82 }
75 83
76 namespace content { 84 namespace content {
77 85
78 void LibraryLoaderExitHook() { 86 void LibraryLoaderExitHook() {
79 if (g_at_exit_manager) { 87 if (g_at_exit_manager) {
80 delete g_at_exit_manager; 88 delete g_at_exit_manager;
81 g_at_exit_manager = NULL; 89 g_at_exit_manager = NULL;
82 } 90 }
83 } 91 }
84 92
85 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 93 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
86 return RegisterNativesImpl(env); 94 return RegisterNativesImpl(env);
87 } 95 }
88 96
89 } // namespace content 97 } // namespace content
OLDNEW
« no previous file with comments | « content/app/android/content_jni_registrar.cc ('k') | content/browser/android/browser_jni_registrar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698