Annotate some Java classes with @JNINamespace("content").

This lets us make the JNI free functions part of the content
namespace (while keeping them 'static').

Review URL: https://chromiumcodereview.appspot.com/10696049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146562 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 9 deletions

diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc
index bb98ce7..bd509ca 100644
--- a/content/app/android/content_main.cc
+++ b/content/app/android/content_main.cc
@@ -28,9 +28,9 @@ LazyInstance<scoped_ptr<ContentMainDelegate> > g_content_main_delegate =
 
 }  // namespace
 
-static void InitApplicationContext(JNIEnv* env,
-                                   jclass clazz,
-                                   jobject context) {
+namespace content {
+
+static void InitApplicationContext(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
   base::android::InitApplicationContext(scoped_context);
 }
@@ -56,8 +56,6 @@ static jint Start(JNIEnv* env, jclass clazz) {
   return g_content_runner.Get()->Run();
 }
 
-namespace content {
-
 void SetContentMainDelegate(ContentMainDelegate* delegate) {
   DCHECK(!g_content_main_delegate.Get().get());
   g_content_main_delegate.Get().reset(delegate);
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 2287a19..0661fe1 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -30,8 +30,10 @@ namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
 }
 
-jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
-                                   jobjectArray init_command_line) {
+namespace content {
+
+static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
+                                          jobjectArray init_command_line) {
   InitNativeCommandLineFromJavaArray(env, init_command_line);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ -78,8 +80,6 @@ jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
   return JNI_TRUE;
 }
 
-namespace content {
-
 void LibraryLoaderExitHook() {
   if (g_at_exit_manager) {
     delete g_at_exit_manager;