Update To 11.40.268.0

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

diff --git a/src/ui/base/test/run_all_unittests.cc b/src/ui/base/test/run_all_unittests.cc
index 26885c8..4215631 100644 (file)
--- a/src/ui/base/test/run_all_unittests.cc
+++ b/src/ui/base/test/run_all_unittests.cc
@@ -19,6 +19,7 @@
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/bundle_locations.h"
+#include "base/test/mock_chrome_application_mac.h"
 #endif
 
 #if defined(OS_WIN)
@@ -33,8 +34,8 @@ class UIBaseTestSuite : public base::TestSuite {
 
  protected:
   // base::TestSuite:
-  virtual void Initialize() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
+  void Initialize() override;
+  void Shutdown() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UIBaseTestSuite);
@@ -47,7 +48,7 @@ void UIBaseTestSuite::Initialize() {
   base::TestSuite::Initialize();
 
 #if defined(OS_WIN)
-  gfx::ForceHighDPISupportForTesting(1.0);
+  gfx::InitDeviceScaleFactor(1.0);
 #endif
 
 #if defined(OS_ANDROID)
@@ -62,6 +63,8 @@ void UIBaseTestSuite::Initialize() {
   PathService::Get(base::DIR_EXE, &exe_path);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
+  mock_cr_app::RegisterMockCrApp();
+
   // On Mac, a test Framework bundle is created that links locale.pak and
   // chrome_100_percent.pak at the appropriate places to ui_test.pak.
   base::mac::SetOverrideFrameworkBundlePath(