Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / embedder / test_embedder.cc

diff --git a/src/mojo/embedder/test_embedder.cc b/src/mojo/embedder/test_embedder.cc
index 049855d..f388423 100644 (file)
--- a/src/mojo/embedder/test_embedder.cc
+++ b/src/mojo/embedder/test_embedder.cc
@@ -6,6 +6,9 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/simple_platform_support.h"
 #include "mojo/system/core.h"
 #include "mojo/system/entrypoints.h"
 #include "mojo/system/handle_table.h"
@@ -38,10 +41,14 @@ bool ShutdownCheckNoLeaks(Core* core_impl) {
 namespace embedder {
 namespace test {
 
+void InitWithSimplePlatformSupport() {
+  Init(scoped_ptr<PlatformSupport>(new SimplePlatformSupport()));
+}
+
 bool Shutdown() {
   system::Core* core = system::entrypoints::GetCore();
   CHECK(core);
-  system::entrypoints::SetCore(NULL);
+  system::entrypoints::SetCore(nullptr);
 
   bool rv = system::internal::ShutdownCheckNoLeaks(core);
   delete core;