Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / keyboard / test / run_all_unittests.cc

diff --git a/src/ui/keyboard/test/run_all_unittests.cc b/src/ui/keyboard/test/run_all_unittests.cc
index e95dcbe..c81e199 100644 (file)
--- a/src/ui/keyboard/test/run_all_unittests.cc
+++ b/src/ui/keyboard/test/run_all_unittests.cc
@@ -8,8 +8,10 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gl/gl_surface.h"
 
 namespace {
 
@@ -18,20 +20,17 @@ class KeyboardTestSuite : public base::TestSuite {
   KeyboardTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  protected:
-  virtual void Initialize() OVERRIDE {
+  void Initialize() override {
     base::TestSuite::Initialize();
+    gfx::GLSurface::InitializeOneOffForTests();
     ui::RegisterPathProvider();
 
-    base::FilePath pak_dir;
-    PathService::Get(base::DIR_MODULE, &pak_dir);
-
-    base::FilePath pak_file;
-    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
-
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+    base::FilePath ui_test_pak_path;
+    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
   }
 
-  virtual void Shutdown() OVERRIDE {
+  void Shutdown() override {
     ui::ResourceBundle::CleanupSharedInstance();
     base::TestSuite::Shutdown();
   }