Android content shell bringup.

content/browser/android/library_loader_hooks.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
+#include "base/android/jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
 #include "content/public/common/content_switches.h"
+#include "content/browser/android/command_line.h"
+#include "content/browser/android/trace_event_binding.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 
+namespace {
+base::AtExitManager* g_at_exit_manager = NULL;
+}
+
+namespace content {
+namespace android {

[Ted C, 2012/05/09 00:26:41]

create a content_jni_registrar

+
+base::android::RegistrationMethod kContentRegisteredMethods[] = {
+  { "CommandLine", RegisterCommandLine },
+  { "TraceEvent", RegisterTraceEvent },
+};
+
+bool RegisterJni(JNIEnv* env) {
+  return RegisterNativeMethods(env, kContentRegisteredMethods,
+                               arraysize(kContentRegisteredMethods));
+}
+
+}  // android
+}  // content
+
 jboolean LibraryLoaderEntryHook(JNIEnv* env, jclass clazz,
                                 jobjectArray init_command_line) {
-
-  // TODO(tedchoc): Initialize the native command line from the java array
-  // passed in.
+  // We need the Chrome AtExitManager to be created before we do any tracing or
+  // logging.
+  g_at_exit_manager = new base::AtExitManager();
+  InitNativeCommandLineFromJavaArray(env, init_command_line);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTraceStartup)) {
     base::debug::TraceLog::GetInstance()->SetEnabled(
         command_line->GetSwitchValueASCII(switches::kTraceStartup));
   }
 
   // Can only use event tracing after setting up the command line.
   TRACE_EVENT0("jni", "JNI_OnLoad continuation");
@@ skipping 10 matching lines @@
                        false);   // Tick count
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   if (!base::android::RegisterJni(env))
     return JNI_FALSE;
 
   if (!net::android::RegisterJni(env))
     return JNI_FALSE;
 
+  if (!content::android::RegisterJni(env))
+    return JNI_FALSE;
+
   if (!media::RegisterJni(env))
     return JNI_FALSE;
 
   return JNI_TRUE;
 }
 
+void LibraryLoaderExitHook() {
+  if (g_at_exit_manager) {
+    delete g_at_exit_manager;
+    g_at_exit_manager = NULL;
+  }
+}
+
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   // TODO(bulach): use the jni generator once we move jni_helper methods here.
   const JNINativeMethod kMethods[] = {
       { "nativeLibraryLoadedOnMainThread", "([Ljava/lang/String;)Z",
           reinterpret_cast<void*>(LibraryLoaderEntryHook) },
   };
   const int kMethodsSize = arraysize(kMethods);
-  // TODO(tedchoc): Upstream LibraryLoader.java and replace path to make this
-  // work.
-  const char kLibraryLoaderPath[] = "";
+  const char kLibraryLoaderPath[] =
+    "org/chromium/content/browser/LibraryLoader";

[Ted C, 2012/05/09 00:26:41]

+2 indent

[John Grabowski, 2012/05/09 17:18:15]

The style guide is ambiguous on this point (as far as I can tell).  This is not
a wrapped parameter; default indentation is 2.  So I disagree.

   base::android::ScopedJavaLocalRef<jclass> clazz =
       base::android::GetClass(env, kLibraryLoaderPath);
 
   if (env->RegisterNatives(clazz.obj(),
                            kMethods,
                            kMethodsSize) < 0) {
     return false;
   }
   return true;
 }