Revert of Simplify mojo_shell since it's now only used for Mandoline.

mojo/shell/native_application_support.cc

 // Copyright 2014 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 "mojo/shell/native_application_support.h"
 
-#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_thunks.h"
 #include "mojo/public/platform/native/gles2_thunks.h"
@@ skipping 80 matching lines @@
   // Go shared library support requires us to initialize the runtime before we
   // start running any go code. This is a temporary patch.
   typedef void (*InitGoRuntimeFn)();
   InitGoRuntimeFn init_go_runtime = reinterpret_cast<InitGoRuntimeFn>(
       base::GetFunctionPointerFromNativeLibrary(app_library, "InitGoRuntime"));
   if (init_go_runtime) {
     DVLOG(2) << "InitGoRuntime: Initializing Go Runtime found in app";
     init_go_runtime();
   }
 
-#if !defined(OS_WIN)
-  // On Windows, initializing base::CommandLine with null parameters gets the
-  // process's command line from the OS. Other platforms need it to be passed
-  // in. This needs to be passed in before the app initializes the command line,
-  // which is done as soon as it loads.
-  typedef void (*InitCommandLineArgs)(int, const char* const*);
-  InitCommandLineArgs init_command_line_args =
-      reinterpret_cast<InitCommandLineArgs>(
-          base::GetFunctionPointerFromNativeLibrary(app_library,
-                                                    "InitCommandLineArgs"));
-  if (init_command_line_args) {
-    int argc = 0;
-    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-    const char** argv = new const char* [cmd_line->argv().size()];
-    for (auto& arg : cmd_line->argv())
-      argv[argc++] = arg.c_str();
-    init_command_line_args(argc, argv);
-  }
-#endif
-
   typedef MojoResult (*MojoMainFunction)(MojoHandle);
   MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
       base::GetFunctionPointerFromNativeLibrary(app_library, "MojoMain"));
   if (!main_function) {
     LOG(ERROR) << "MojoMain not found";
     return false;
   }
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = application_request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result < MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
   }
   return true;
 }
 
 }  // namespace shell
 }  // namespace mojo