Update To 11.40.268.0

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

diff --git a/src/ui/gfx/test/run_all_unittests.cc b/src/ui/gfx/test/run_all_unittests.cc
index 14ceef9..1483929 100644 (file)
--- a/src/ui/gfx/test/run_all_unittests.cc
+++ b/src/ui/gfx/test/run_all_unittests.cc
@@ -17,6 +17,10 @@
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+#include "base/test/mock_chrome_application_mac.h"
+#endif
+
 namespace {
 
 class GfxTestSuite : public base::TestSuite {
@@ -24,13 +28,17 @@ class GfxTestSuite : public base::TestSuite {
   GfxTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  protected:
-  virtual void Initialize() OVERRIDE {
+  void Initialize() override {
     base::TestSuite::Initialize();
 
 #if defined(OS_ANDROID)
     gfx::android::RegisterJni(base::android::AttachCurrentThread());
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+    mock_cr_app::RegisterMockCrApp();
+#endif
+
     ui::RegisterPathProvider();
 
     base::FilePath ui_test_pak_path;
@@ -38,7 +46,7 @@ class GfxTestSuite : public base::TestSuite {
     ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
   }
 
-  virtual void Shutdown() OVERRIDE {
+  void Shutdown() override {
     ui::ResourceBundle::CleanupSharedInstance();
     base::TestSuite::Shutdown();
   }