|
Revert 272472 "Mojo: nuke EnvironmentData"
Caused layout tests (when run with check-sys-deps) to hang on Windows
with a stuck content_shell process. See Issue 376929.
BUG= 376929
> 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
TBR=darin@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272589
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+102 lines, -17 lines) |
Patch |
 |
M |
trunk/src/content/app/content_main_runner.cc
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/app/mojo/mojo_init.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/app/mojo/mojo_init.cc
|
View
|
|
1 chunk |
+14 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/test/content_test_launcher.cc
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/android/javatests/core_test.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/apps/js/test/js_to_cpp_unittest.cc
|
View
|
|
3 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/mojo/common/environment_data.h
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/mojo/common/environment_data.cc
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/common/handle_watcher.cc
|
View
|
|
4 chunks |
+21 lines, -3 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/common/handle_watcher_unittest.cc
|
View
|
|
3 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/environment/environment.cc
|
View
|
|
1 chunk |
+21 lines, -5 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/examples/pepper_container_app/pepper_container_app.cc
|
View
|
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/mojo.gyp
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/public/cpp/environment/environment.h
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/public/cpp/environment/lib/environment.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/service_manager/service_manager_unittest.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/services/dbus_echo/dbus_echo_service.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc
|
View
|
|
3 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/shell/android/mojo_main.cc
|
View
|
|
3 chunks |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/shell/context.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/shell/desktop/mojo_main.cc
|
View
|
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/mojo/shell/shell_test_helper.h
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|