Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / test / content_test_suite.cc

diff --git a/src/content/test/content_test_suite.cc b/src/content/test/content_test_suite.cc
index 6553b67..24bad08 100644 (file)
--- a/src/content/test/content_test_suite.cc
+++ b/src/content/test/content_test_suite.cc
@@ -18,6 +18,9 @@
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
+#if !defined(OS_IOS)
+#include "base/test/mock_chrome_application_mac.h"
+#endif
 #endif
 
 #if !defined(OS_IOS)
@@ -34,12 +37,12 @@ class TestInitializationListener : public testing::EmptyTestEventListener {
   TestInitializationListener() : test_content_client_initializer_(NULL) {
   }
 
-  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestStart(const testing::TestInfo& test_info) override {
     test_content_client_initializer_ =
         new content::TestContentClientInitializer();
   }
 
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestEnd(const testing::TestInfo& test_info) override {
     delete test_content_client_initializer_;
   }
 
@@ -63,6 +66,9 @@ ContentTestSuite::~ContentTestSuite() {
 void ContentTestSuite::Initialize() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
+#if !defined(OS_IOS)
+  mock_cr_app::RegisterMockCrApp();
+#endif
 #endif
 
 #if defined(OS_WIN)