Second attempt to land change to remove NativeViewportService and

mojo/shell/desktop/mojo_main.cc

Index: mojo/shell/desktop/mojo_main.cc
diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc
index 7d57e89d98b1ec0207119863d94824a7fa0f352d..3dac7c78abce1c662de280e647278b700347101c 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/mojo/shell/desktop/mojo_main.cc
@@ -12,14 +12,21 @@
 #include "mojo/shell/init.h"
 #include "mojo/shell/switches.h"
 #include "ui/gfx/switches.h"
+
+#if defined(COMPONENT_BUILD)
 #include "ui/gl/gl_surface.h"
+#endif
 
 namespace {
 
-void RunApps(mojo::shell::Context* context, std::vector<GURL> app_urls) {
-  for (std::vector<GURL>::const_iterator it = app_urls.begin();
-       it != app_urls.end(); ++it) {
-    context->Run(*it);
+void RunApps(mojo::shell::Context* context) {
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  base::CommandLine::StringVector args = command_line.GetArgs();
+  for (base::CommandLine::StringVector::const_iterator it = args.begin();
+       it != args.end();
+       ++it) {
+    context->Run(GURL(*it));
   }
 }
 
@@ -43,8 +50,9 @@ int main(int argc, char** argv) {
               *base::CommandLine::ForCurrentProcess())) {
     child_process->Main();
   } else {
+#if defined(COMPONENT_BUILD)
     gfx::GLSurface::InitializeOneOff();
-
+#endif
     // We want the shell::Context to outlive the MessageLoop so that pipes are
     // all gracefully closed / error-out before we try to shut the Context down.
     mojo::shell::Context shell_context;
@@ -59,17 +67,7 @@ int main(int argc, char** argv) {
             GURL(command_line.GetSwitchValueASCII(switches::kOrigin)));
       }
 
-      std::vector<GURL> app_urls;
-      base::CommandLine::StringVector args = command_line.GetArgs();
-      for (base::CommandLine::StringVector::const_iterator it = args.begin();
-           it != args.end();
-           ++it)
-        app_urls.push_back(GURL(*it));
-
-      message_loop.PostTask(FROM_HERE,
-                            base::Bind(RunApps,
-                                       &shell_context,
-                                       app_urls));
+      message_loop.PostTask(FROM_HERE, base::Bind(RunApps, &shell_context));
       message_loop.Run();
     }
   }