Convert ContentMain to take a struct instead of parameters that vary depending on the platform.

chrome/app/chrome_main.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 "chrome/app/chrome_main_delegate.h"
 
 #include "content/public/app/content_main.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 
 #define DLLEXPORT __declspec(dllexport)
 
 // 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);
 }
 #elif defined(OS_POSIX)
 extern "C" {
 __attribute__((visibility("default")))
 int ChromeMain(int argc, const char** argv);
 }
 #endif
 
 #if defined(OS_WIN)
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info) {
+#elif defined(OS_POSIX)
+int ChromeMain(int argc, const char** argv) {
+#endif
+  ChromeMainDelegate chrome_main_delegate;
+  content::ContentMainParams params(&chrome_main_delegate);
+
+#if defined(OS_WIN)
   // The process should crash when going through abnormal termination.
   base::win::SetShouldCrashOnProcessDetach(true);
   base::win::SetAbortBehaviorForCrashReporting();
-  ChromeMainDelegate chrome_main_delegate;
-  int rv = content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
+  params.instance = instance;
+  params.sandbox_info = sandbox_info;
+#else
+  params.argc = argc;
+  params.argv = argv;
+#endif
+
+  int rv = content::ContentMain(params);
+
+#if defined(OS_WIN)
   base::win::SetShouldCrashOnProcessDetach(false);
+#endif
+
   return rv;
-#elif defined(OS_POSIX)
-int ChromeMain(int argc, const char** argv) {
-  ChromeMainDelegate chrome_main_delegate;
-  return content::ContentMain(argc, argv, &chrome_main_delegate);
-#endif
 }