Clean up the remaining diff in content/app

content/app/android/library_loader_hooks.cc

Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index db61cb6ac5b80bb7dad01f31c96989ab5b5aaa46..73c09b5a15ffb86a85d45a3ddb5328472505402e 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+1// Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Yaron, 2012/07/10 21:21:55]

Remove the "1"

[michaelbai, 2012/07/10 22:02:42]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -32,9 +32,6 @@ 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();
@@ -91,6 +88,9 @@ void LibraryLoaderExitHook() {
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
+  // We need the Chrome AtExitManager to be created at the very beginning.
+  g_at_exit_manager = new base::AtExitManager();
+
   return RegisterNativesImpl(env);
 }