Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / themes / browser_theme_pack_unittest.cc

diff --git a/src/chrome/browser/themes/browser_theme_pack_unittest.cc b/src/chrome/browser/themes/browser_theme_pack_unittest.cc
index 18e3dc7..910cfb5 100644 (file)
--- a/src/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/src/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -240,7 +240,9 @@ class BrowserThemePackTest : public ::testing::Test {
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INACTIVE));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO_INACTIVE));
+#if !defined(OS_MACOSX)
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_INCOGNITO));
+#endif
 
     // Make sure we don't have phantom data.
     EXPECT_FALSE(pack->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND,
@@ -258,8 +260,9 @@ class BrowserThemePackTest : public ::testing::Test {
 
     // The high DPI theme does not define the following images:
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND));
-    EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND));
+#if !defined(OS_MACOSX)
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_INCOGNITO));
+#endif
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_V));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_NTP_BACKGROUND));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_OVERLAY));
@@ -469,9 +472,9 @@ TEST_F(BrowserThemePackTest, CanParsePaths) {
   ParseImageNamesJSON(path_json, &out_file_paths);
 
   size_t expected_file_paths = 2u;
-#if defined(OS_WIN)
-  // On Windows additional theme paths are generated to map to the special
-  // resource ids like IDR_THEME_FRAME_WIN, etc
+#if defined(USE_ASH) && !defined(OS_CHROMEOS)
+  // On desktop builds with ash, additional theme paths are generated to map to
+  // the special resource ids like IDR_THEME_FRAME_DESKTOP, etc
   expected_file_paths = 3u;
 #endif
   EXPECT_EQ(expected_file_paths, out_file_paths.size());