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

content/public/app/content_main_runner.h

Index: content/public/app/content_main_runner.h
===================================================================
--- content/public/app/content_main_runner.h	(revision 255735)
+++ content/public/app/content_main_runner.h	(working copy)
@@ -5,22 +5,9 @@
 #ifndef CONTENT_PUBLIC_APP_CONTENT_MAIN_RUNNER_H_
 #define CONTENT_PUBLIC_APP_CONTENT_MAIN_RUNNER_H_
 
-#include <string>
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
-
-namespace sandbox {
-struct SandboxInterfaceInfo;
-}
-
 namespace content {
+struct ContentMainParams;
 
-class ContentMainDelegate;
-
 // This class is responsible for content initialization, running and shutdown.
 class ContentMainRunner {
  public:
@@ -30,19 +17,7 @@
   static ContentMainRunner* Create();
 
   // Initialize all necessary content state.
-#if defined(OS_WIN)
-  // The |sandbox_info| and |delegate| objects must outlive this class.
-  // |sandbox_info| should be initialized using InitializeSandboxInfo from
-  // content_main_win.h.
-  virtual int Initialize(HINSTANCE instance,
-                         sandbox::SandboxInterfaceInfo* sandbox_info,
-                         ContentMainDelegate* delegate) = 0;
-#else
-  // The |delegate| object must outlive this class.
-  virtual int Initialize(int argc,
-                         const char** argv,
-                         ContentMainDelegate* delegate) = 0;
-#endif
+  virtual int Initialize(const ContentMainParams& params) = 0;
 
   // Perform the default run logic.
   virtual int Run() = 0;