Clean up the remaining diff in content/app

content/app/content_main_runner.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/content_main_runner.h"
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 315 matching lines @@
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_params);
   }
 
   if (delegate)
     return delegate->RunProcess(process_type, main_params);
 
   NOTREACHED() << "Unknown zygote process type: " << process_type;
   return 1;
 }
-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
 // Run the FooMain() for a given process type.
 // If |process_type| is empty, runs BrowserMain().
 // Returns the exit code for this process.
 int RunNamedProcessTypeMain(
     const std::string& process_type,
     const MainFunctionParams& main_function_params,
     ContentMainDelegate* delegate) {
   static const MainFunction kMainFunctions[] = {
     { "",                            BrowserMain },
@@ skipping 100 matching lines @@
 
     // On Android,
     // - setlocale() is not supported.
     // - We do not override the signal handlers so that we can get
     //   stack trace when crashing.
     // - The ipc_fd is passed through the Java service.
     // Thus, these are all disabled.
 #if !defined(OS_ANDROID)
     // Set C library locale to make sure CommandLine can parse argument values
     // in correct encoding.
+    // Android doesn't support this.

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

These three comments are covered by the block above. Please remove here and
downstream.

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

Done.

     setlocale(LC_ALL, "");
 
+    // On Android, do not override the signal handlers so that we can get stack
+    // trace when crashing.
     SetupSignalHandlers();
 
+    // Android passes the ipc_fd through the Java service.
     base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance();
     g_fds->Set(kPrimaryIPCChannel,
                kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
     g_fds->Set(kCrashDumpSignal,
                kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
 #endif
 
 #endif  // !OS_WIN
 
     is_initialized_ = true;
     delegate_ = delegate;
 
     base::EnableTerminationOnHeapCorruption();
     base::EnableTerminationOnOutOfMemory();
-
-    // On Android, AtExitManager is set up when library is loaded.
+    // In normal chrome, ContentMainRunner::initialize is where the
+    // AtExitManager is registered. In android, we need to do it earlier because
+    // we use LazyInstances very early on and LazyInstance requires

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

I think the old comment was preferred (i.e. do the same thing as above)

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

Done.

+    // AtExitManager.
 #if !defined(OS_ANDROID)
     // The exit manager is in charge of calling the dtors of singleton objects.
     exit_manager_.reset(new base::AtExitManager);
 #endif
 
 #if defined(OS_MACOSX)
     // We need this pool for all the objects created before we get to the
     // event loop, but we don't want to leave them hanging around until the
     // app quits. Each "main" needs to flush this pool right before it goes into
     // its main event loop to get rid of the cruft.
@@ skipping 192 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content