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

content/app/android/content_main.cc

Index: content/app/android/content_main.cc
===================================================================
--- content/app/android/content_main.cc	(revision 255735)
+++ content/app/android/content_main.cc	(working copy)
@@ -16,9 +16,9 @@
 #include "jni/ContentMain_jni.h"
 
 using base::LazyInstance;
-using content::ContentMainRunner;
-using content::ContentMainDelegate;
 
+namespace content {
+
 namespace {
 LazyInstance<scoped_ptr<ContentMainRunner> > g_content_runner =
     LAZY_INSTANCE_INITIALIZER;
@@ -28,8 +28,6 @@
 
 }  // namespace
 
-namespace content {
-
 static void InitApplicationContext(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
   base::android::InitApplicationContext(env, scoped_context);
@@ -43,9 +41,9 @@
   // request then we have to call this a second time to finish starting the
   // browser synchronously.
   if (!g_content_runner.Get().get()) {
+    ContentMainParams params(g_content_main_delegate.Get().get());
     g_content_runner.Get().reset(ContentMainRunner::Create());
-    g_content_runner.Get()->Initialize(
-        0, NULL, g_content_main_delegate.Get().get());
+    g_content_runner.Get()->Initialize(params);
   }
   return g_content_runner.Get()->Run();
 }