summaryrefslogtreecommitdiffstats
path: root/mojo/android/javatests
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 10:41:13 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 10:41:13 +0000
commitbf418af31de8ba8aa201e45ab4b22bf93a192805 (patch)
tree350975bedd8bf76bd9c55ea934905c0f816a9bb3 /mojo/android/javatests
parent56f854a66b24cae18415673ae6665fdf9e9da80d (diff)
downloadchromium_src-bf418af31de8ba8aa201e45ab4b22bf93a192805.zip
chromium_src-bf418af31de8ba8aa201e45ab4b22bf93a192805.tar.gz
chromium_src-bf418af31de8ba8aa201e45ab4b22bf93a192805.tar.bz2
Mojo: nuke EnvironmentData
With this change, Mojo applications that link against mojo_environment_chromium do not need to instantiate mojo::Environment. We rely on AtExitManager for all finalization of singleton objects. This frees us up to use the familiar base::Singleton and base::LazyInstance for any such state. Tests can use ShadowingAtExitManager to clean the environment between test runs. It becomes a link error to use mojo::Environment if you are not linking against mojo_environment_standalone. I plan to follow this up with a change that buries mojo::Environment for the case where you are linking against mojo_environment_standalone. Ideally, this means no one will ever need to think about mojo::Environment again. Review URL: https://codereview.chromium.org/281353005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/android/javatests')
-rw-r--r--mojo/android/javatests/core_test.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/mojo/android/javatests/core_test.cc b/mojo/android/javatests/core_test.cc
index 38aa6c4..2c2054d 100644
--- a/mojo/android/javatests/core_test.cc
+++ b/mojo/android/javatests/core_test.cc
@@ -17,7 +17,6 @@
namespace {
struct TestEnvironment {
- mojo::Environment environment;
base::MessageLoopForUI message_loop;
};