Mojo: nuke EnvironmentData

mojo/shell/desktop/mojo_main.cc

 // Copyright 2013 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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/shell/child_process.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 #include "mojo/shell/run.h"
 #include "mojo/shell/switches.h"
 #include "ui/gl/gl_surface.h"
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  mojo::Environment env;
   base::CommandLine::Init(argc, argv);
   mojo::shell::InitializeLogging();
 
   // TODO(vtl): Unify parent and child process cases to the extent possible.
   if (scoped_ptr<mojo::shell::ChildProcess> child_process =
           mojo::shell::ChildProcess::Create(
               *base::CommandLine::ForCurrentProcess())) {
     child_process->Main();
   } else {
     gfx::GLSurface::InitializeOneOff();
@@ skipping 18 matching lines @@
     message_loop.PostTask(FROM_HERE,
                           base::Bind(mojo::shell::Run,
                                      &shell_context,
                                      app_urls));
 
     message_loop.Run();
   }
 
   return 0;
 }