Make setting the user agent work with the zygote on linux.

content/app/content_main.cc

 // Copyright (c) 2011 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/app/content_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/stats_table.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "content/app/content_main_delegate.h"
 #include "content/app/startup_helper_win.h"
 #include "content/browser/browser_main.h"
+#include "content/common/content_client.h"
 #include "content/common/content_constants.h"
 #include "content/common/content_paths.h"
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/common/set_process_title.h"
 #include "content/public/common/content_switches.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_switches.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_paths.h"
+#include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #elif defined(OS_MACOSX)
 #include "base/mach_ipc_mac.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/browser/mach_broker_mac.h"
 #endif // OS_WIN
@@ skipping 155 matching lines @@
   // This function call can return multiple times, once per fork().
   if (!ZygoteMain(main_function_params, zygote_fork_delegate.get()))
     return 1;
 
   if (delegate) delegate->ZygoteForked();
 
   // Zygote::HandleForkRequest may have reallocated the command
   // line so update it here with the new version.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
+  // If a custom user agent was passed on the command line, we need
+  // to (re)set it now, rather than using the default one the zygote
+  // initialized.
+  bool custom = false;
+  std::string ua = content::GetContentClient()->GetUserAgent(&custom);
+  if (custom) {

[jam, 2011/10/15 01:32:04]

nit: this file doesn't use brace brackets for single line statements

[Dirk Pranke, 2011/10/15 02:14:07]

Will fix.

+    webkit_glue::ResetUserAgent(ua, custom);
+  }
+
   // The StatsTable must be initialized in each process; we already
   // initialized for the browser process, now we need to initialize
   // within the new processes as well.
   pid_t browser_pid = base::GetParentProcessId(
       base::GetParentProcessId(base::GetCurrentProcId()));
   InitializeStatsTable(browser_pid, command_line);
 
   MainFunctionParams main_params(command_line,
                                  main_function_params.sandbox_info_,
                                  main_function_params.autorelease_pool_);
@@ skipping 232 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif  // OS_WIN
 
   return exit_code;
 }
 
 }  // namespace content