Adds a way to associate key/value pairs with the environment

content/app/mojo/mojo_init.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 "content/app/mojo/mojo_init.h"
 
-#include "base/lazy_instance.h"
 #include "mojo/embedder/embedder.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/service_manager/service_manager.h"
 
 namespace content {
 
 namespace {
 
-struct Initializer {
-  Initializer() {
-    // TODO(davemoore): Configuration goes here. For now just create the shared
-    // instance of the ServiceManager.
-    mojo::ServiceManager::GetInstance();
-    mojo::embedder::Init();
-  }
-};
-
-static base::LazyInstance<Initializer>::Leaky initializer =
-    LAZY_INSTANCE_INITIALIZER;
+mojo::Environment* environment = NULL;
 
 }  // namespace
 
-// Initializes mojo. Use a lazy instance to ensure we only do this once.
 void InitializeMojo() {
-  initializer.Get();
+  DCHECK(!environment);
+  environment = new mojo::Environment;
+  // instance of the ServiceManager.

[darin (slow to review), 2014/03/31 23:21:55]

nit: "instance of" -> "Instantiate" ?

[sky, 2014/03/31 23:54:40]

This was part of a comment on 18 (old). Makes no sense here. Nuked.

+  mojo::ServiceManager::GetInstance();
+  mojo::embedder::Init();

[darin (slow to review), 2014/03/31 23:21:55]

Maybe we should initialize mojo core before initializing services that use it?
ServiceManager initialization should probably come second.

[sky, 2014/03/31 23:54:40]

I copied this code. Dave says order shouldn't matter, so I changed it.

+}
+
+void ShutdownMojo() {
+  delete environment;

[darin (slow to review), 2014/03/31 23:21:55]

it is not clear why there is a benefit to storing EnvironmentData on
Environment. since EnvironmentData is reached via
EnvironmentData::GetInstance(), it seems like it doesn't need to have anything
to do with the lifetime of Environment. You could just manually create and
destroy EnvironmentData here from InitializeMojo and ShutdownMojo.

+  environment = NULL;
 }
 
 }  // namespace content