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

content/app/content_main.cc

Index: content/app/content_main.cc
===================================================================
--- content/app/content_main.cc	(revision 255697)
+++ content/app/content_main.cc	(working copy)
@@ -9,26 +9,10 @@
 
 namespace content {
 
-#if defined(OS_WIN)
-int ContentMain(HINSTANCE instance,
-                sandbox::SandboxInterfaceInfo* sandbox_info,
-                ContentMainDelegate* delegate) {
-#else
-int ContentMain(int argc,
-                const char** argv,
-                ContentMainDelegate* delegate) {
-#endif  // OS_WIN
-
+int ContentMain(ContentMainParams* params) {

[sky, 2014/03/07 23:14:22]

Is it possible to make the various mains take a const ContentMainParams& ?

[jam, 2014/03/07 23:29:12]

Done.

   scoped_ptr<ContentMainRunner> main_runner(ContentMainRunner::Create());
 
-  int exit_code;
-
-#if defined(OS_WIN)
-  exit_code = main_runner->Initialize(instance, sandbox_info, delegate);
-#else
-  exit_code = main_runner->Initialize(argc, argv, delegate);
-#endif  // OS_WIN
-
+  int exit_code = main_runner->Initialize(params);
   if (exit_code >= 0)
     return exit_code;