Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / extensions / test / extensions_unittests_main.cc

diff --git a/src/extensions/test/extensions_unittests_main.cc b/src/extensions/test/extensions_unittests_main.cc
index 50b0247..9ec7e24 100644 (file)
--- a/src/extensions/test/extensions_unittests_main.cc
+++ b/src/extensions/test/extensions_unittests_main.cc
@@ -13,8 +13,9 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/test/test_extensions_client.h"
-#include "mojo/embedder/embedder.h"
+#include "mojo/embedder/test_embedder.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gl/gl_surface.h"
 
 namespace {
 
@@ -64,6 +65,7 @@ ExtensionsTestSuite::~ExtensionsTestSuite() {}
 
 void ExtensionsTestSuite::Initialize() {
   content::ContentTestSuiteBase::Initialize();
+  gfx::GLSurface::InitializeOneOffForTests();
 
   // Register the chrome-extension:// scheme via this circuitous path. Note
   // that this does not persistently set up a ContentClient; individual tests
@@ -98,7 +100,7 @@ void ExtensionsTestSuite::Shutdown() {
 int main(int argc, char** argv) {
   content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
 
-  mojo::embedder::Init();
+  mojo::embedder::test::InitWithSimplePlatformSupport();
   return base::LaunchUnitTests(argc,
                                argv,
                                base::Bind(&content::UnitTestTestSuite::Run,