Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / base / resource / resource_bundle_unittest.cc

diff --git a/src/ui/base/resource/resource_bundle_unittest.cc b/src/ui/base/resource/resource_bundle_unittest.cc
index 1a3d7be..4acf863 100644 (file)
--- a/src/ui/base/resource/resource_bundle_unittest.cc
+++ b/src/ui/base/resource/resource_bundle_unittest.cc
@@ -11,7 +11,6 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -77,20 +76,20 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
       ui::ScaleFactor scale_factor));
   virtual bool GetRawDataResource(int resource_id,
                                   ui::ScaleFactor scale_factor,
-                                  base::StringPiece* value) OVERRIDE {
+                                  base::StringPiece* value) override {
     *value = GetRawDataResourceMock(resource_id, scale_factor);
     return true;
   }
   MOCK_METHOD1(GetLocalizedStringMock, base::string16(int message_id));
   virtual bool GetLocalizedString(int message_id,
-                                  base::string16* value) OVERRIDE {
+                                  base::string16* value) override {
     *value = GetLocalizedStringMock(message_id);
     return true;
   }
   MOCK_METHOD1(GetFontMock,
                gfx::Font*(ui::ResourceBundle::FontStyle style));
   virtual scoped_ptr<gfx::Font> GetFont(
-      ui::ResourceBundle::FontStyle style) OVERRIDE {
+      ui::ResourceBundle::FontStyle style) override {
     return scoped_ptr<gfx::Font>(GetFontMock(style));
   }
 };
@@ -149,13 +148,10 @@ class ResourceBundleTest : public testing::Test {
   ResourceBundleTest() : resource_bundle_(NULL) {
   }
 
-  virtual ~ResourceBundleTest() {
-  }
+  ~ResourceBundleTest() override {}
 
   // Overridden from testing::Test:
-  virtual void TearDown() OVERRIDE {
-    delete resource_bundle_;
-  }
+  void TearDown() override { delete resource_bundle_; }
 
   // Returns new ResoureBundle with the specified |delegate|. The
   // ResourceBundleTest class manages the lifetime of the returned
@@ -342,7 +338,7 @@ TEST_F(ResourceBundleTest, DelegateGetLocalizedStringWithOverride) {
   EXPECT_EQ(delegate_data, result);
 }
 
-#if defined(USE_OZONE) && !defined(USE_PANGO)
+#if (defined(USE_OZONE) && !defined(USE_PANGO)) || defined(OS_ANDROID)
 #define MAYBE_DelegateGetFontList DISABLED_DelegateGetFontList
 #else
 #define MAYBE_DelegateGetFontList DelegateGetFontList
@@ -380,10 +376,9 @@ class ResourceBundleImageTest : public ResourceBundleTest {
  public:
   ResourceBundleImageTest() {}
 
-  virtual ~ResourceBundleImageTest() {
-  }
+  ~ResourceBundleImageTest() override {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     // Create a temporary directory to write test resource bundles to.
     ASSERT_TRUE(dir_.CreateUniqueTempDir());
   }
@@ -473,7 +468,7 @@ TEST_F(ResourceBundleImageTest, GetRawDataResource) {
 // via ResourceBundle::GetImageNamed().
 TEST_F(ResourceBundleImageTest, GetImageNamed) {
 #if defined(OS_WIN)
-  gfx::ForceHighDPISupportForTesting(2.0);
+  gfx::InitDeviceScaleFactor(2.0);
 #endif
   std::vector<ScaleFactor> supported_factors;
   supported_factors.push_back(SCALE_FACTOR_100P);