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

Unified Diff: trunk/src/mojo/apps/js/test/js_to_cpp_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/android/javatests/core_test.cc ('k') | trunk/src/mojo/common/environment_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/apps/js/test/js_to_cpp_unittest.cc
===================================================================
--- trunk/src/mojo/apps/js/test/js_to_cpp_unittest.cc (revision 272588)
+++ trunk/src/mojo/apps/js/test/js_to_cpp_unittest.cc (working copy)
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/at_exit.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/message_loop/message_loop.h"
@@ -14,6 +13,7 @@
#include "mojo/common/common_type_converters.h"
#include "mojo/common/test/test_utils.h"
#include "mojo/public/cpp/bindings/allocation_scope.h"
+#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/system/core.h"
#include "mojo/public/cpp/system/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -414,7 +414,7 @@
}
private:
- base::ShadowingAtExitManager at_exit_;
+ Environment environment;
base::MessageLoop loop;
base::RunLoop run_loop_;
« no previous file with comments | « trunk/src/mojo/android/javatests/core_test.cc ('k') | trunk/src/mojo/common/environment_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698