Clean up the remaining diff in content/app

content/app/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/app/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"
@@ skipping 14 matching lines @@
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "jni/library_loader_jni.h"
 
 namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
 }
 
 jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
                                    jobjectArray init_command_line) {
-  // 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.
@@ skipping 36 matching lines @@
 namespace content {
 
 void LibraryLoaderExitHook() {
   if (g_at_exit_manager) {
     delete g_at_exit_manager;
     g_at_exit_manager = NULL;
   }
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
+  // We need the Chrome AtExitManager to be created at the very beginning.

[jam, 2012/07/10 23:52:35]

nit: drop the "Chrome"

[michaelbai, 2012/07/11 00:18:09]

Done.

+  g_at_exit_manager = new base::AtExitManager();
+
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content