Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/mojo/shell/context.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 "mojo/shell/context.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 31 matching lines @@
     gles2::GLES2SupportImpl::Init();
   }
 
   ~Setup() {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
-static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<Setup> setup = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 class Context::NativeViewportServiceLoader : public ServiceLoader {
  public:
   explicit NativeViewportServiceLoader(Context* context) : context_(context) {}
   virtual ~NativeViewportServiceLoader() {}
 
  private:
   virtual void LoadService(ServiceManager* manager,
@@ skipping 66 matching lines @@
 #if defined(USE_AURA)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(),
       GURL("mojo:mojo_view_manager"));
 #endif
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
 }
 
 }  // namespace shell
 }  // namespace mojo