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

content/public/app/content_main.h

Index: content/public/app/content_main.h
===================================================================
--- content/public/app/content_main.h	(revision 255697)
+++ content/public/app/content_main.h	(working copy)
@@ -5,6 +5,8 @@
 #ifndef CONTENT_PUBLIC_APP_CONTENT_MAIN_H_
 #define CONTENT_PUBLIC_APP_CONTENT_MAIN_H_
 
+#include <stddef.h>
+
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 
@@ -17,21 +19,40 @@
 }
 
 namespace content {
-
 class ContentMainDelegate;
 
+struct ContentMainParams {
+  explicit ContentMainParams(ContentMainDelegate* delegate)
+      : delegate(delegate),
+#if defined(OS_WIN)
+        instance(NULL),
+        sandbox_info(NULL)
+#elif !defined(OS_ANDROID)
+        argc(0),
+        argv(NULL)
+#endif
+        {
+  }
+
+  ContentMainDelegate* delegate;
+
+#if defined(OS_WIN)
+  HINSTANCE instance;
+
+  // |sandbox_info| should be initialized using InitializeSandboxInfo from
+  // content_main_win.h
+  sandbox::SandboxInterfaceInfo* sandbox_info;
+#elif !defined(OS_ANDROID)
+  int  argc;

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

nit: I think you have 2 spaces here.

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

Done.

+  const char** argv;
+#endif
+};
+
 // ContentMain should be called from the embedder's main() function to do the
 // initial setup for every process. The embedder has a chance to customize
 // startup using the ContentMainDelegate interface. The embedder can also pass
 // in NULL for |delegate| if they don't want to override default startup.
-#if defined(OS_WIN)
-
-// |sandbox_info| should be initialized using InitializeSandboxInfo from
-// content_main_win.h
-CONTENT_EXPORT int ContentMain(HINSTANCE instance,
-                               sandbox::SandboxInterfaceInfo* sandbox_info,
-                               ContentMainDelegate* delegate);
-#elif defined(OS_ANDROID)
+#if defined(OS_ANDROID)
 // In the Android, the content main starts from ContentMain.java, This function
 // provides a way to set the |delegate| as ContentMainDelegate for
 // ContentMainRunner.
@@ -39,10 +60,8 @@
 // The ownership of |delegate| is transferred.
 CONTENT_EXPORT void SetContentMainDelegate(ContentMainDelegate* delegate);
 #else
-CONTENT_EXPORT int ContentMain(int argc,
-                               const char** argv,
-                               ContentMainDelegate* delegate);
-#endif  // defined(OS_WIN)
+CONTENT_EXPORT int ContentMain(ContentMainParams* params);
+#endif
 
 }  // namespace content