Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1583)

Unified Diff: trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc

Issue 299263002: Revert 272472 "Mojo: nuke EnvironmentData" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/mojo/services/dbus_echo/dbus_echo_service.cc ('k') | trunk/src/mojo/shell/android/mojo_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc
===================================================================
--- trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc (revision 272588)
+++ trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc (working copy)
@@ -5,7 +5,6 @@
#include <string>
#include <vector>
-#include "base/at_exit.h"
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -14,6 +13,7 @@
#include "mojo/common/common_type_converters.h"
#include "mojo/geometry/geometry_type_converters.h"
#include "mojo/public/cpp/bindings/allocation_scope.h"
+#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/shell/connect.h"
#include "mojo/services/public/cpp/view_manager/util.h"
#include "mojo/services/public/cpp/view_manager/view_manager_types.h"
@@ -415,7 +415,6 @@
view_manager2_.reset();
}
- base::ShadowingAtExitManager at_exit_;
base::MessageLoop loop_;
shell::ShellTestHelper test_helper_;
« no previous file with comments | « trunk/src/mojo/services/dbus_echo/dbus_echo_service.cc ('k') | trunk/src/mojo/shell/android/mojo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698