Linux: set the process title (that shows in "ps" etc.) of renderers correctly when using the zygote.

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2009 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.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 79 matching lines @@
 
 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
 extern "C" {
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info,
                                  TCHAR* command_line);
 }
 #elif defined(OS_POSIX)
 extern "C" {
 __attribute__((visibility("default")))
-int ChromeMain(int argc, const char** argv);
+int ChromeMain(int argc, char** argv);
 }
 #endif
 
 namespace {
 
 #if defined(OS_WIN)
 const wchar_t kProfilingDll[] = L"memory_watcher.dll";
 
 // Load the memory profiling DLL.  All it needs to be activated
 // is to be loaded.  Return true on success, false otherwise.
@@ skipping 180 matching lines @@
 #endif
 }
 
 }  // namespace
 
 #if defined(OS_WIN)
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info,
                                  TCHAR* command_line) {
 #elif defined(OS_POSIX)
-int ChromeMain(int argc, const char** argv) {
+int ChromeMain(int argc, char** argv) {
 #endif
 
 #if defined(OS_MACOSX)
   // TODO(mark): Some of these things ought to be handled in chrome_exe_main.mm.
   // Under the current architecture, nothing in chrome_exe_main can rely
   // directly on chrome_dll code on the Mac, though, so until some of this code
   // is refactored to avoid such a dependency, it lives here.  See also the
   // TODO(mark) below at InitCrashReporter() and DestructCrashReporter().
   base::EnableTerminationOnHeapCorruption();
 #endif  // OS_MACOSX
@@ skipping 24 matching lines @@
   // in correct encoding.
   setlocale(LC_ALL, "");
 #endif
 
   // Initialize the command line.
 #if defined(OS_WIN)
   CommandLine::Init(0, NULL);
 #else
   CommandLine::Init(argc, argv);
 #endif
+#if defined(OS_LINUX)
+  // Set up CommandLine::SetProcTitle() support.
+  CommandLine::SetTrueArgv(argv);
+#endif
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   std::wstring process_type =
       parsed_command_line.GetSwitchValue(switches::kProcessType);
 
 #if defined(OS_MACOSX)
   // If process_type is not empty, this is the helper.  Set the main app bundle
   // so code can fetch Mac resources.
   if (!process_type.empty()) {
     FilePath main_path(chrome::GetBrowserBundlePath());
@@ skipping 231 matching lines @@
     // We want to be sure to init NSPR on the main thread.
     base::EnsureNSPRInit();
 
     g_thread_init(NULL);
     // Glib type system initialization. Needed at least for gconf,
     // used in net/proxy/proxy_config_service_linux.cc. Most likely
     // this is superfluous as gtk_init() ought to do this. It's
     // definitely harmless, so retained as a reminder of this
     // requirement for gconf.
     g_type_init();
-    // gtk_init() can change |argc| and |argv|, but nobody else uses them.
-    gtk_init(&argc, const_cast<char***>(&argv));
+    // gtk_init() can change |argc| and |argv|.
+    gtk_init(&argc, &argv);
     SetUpGLibLogHandler();
 #endif
 
     ScopedOleInitializer ole_initializer;
     rv = BrowserMain(main_params);
   } else {
     NOTREACHED() << "Unknown process type";
   }
 
   if (!process_type.empty()) {
@@ skipping 10 matching lines @@
 
   logging::CleanupChromeLogging();
 
 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
   // TODO(mark): See the TODO(mark) above at InitCrashReporter.
   DestructCrashReporter();
 #endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
 
   return rv;
 }