Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(754)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/resource/resource_bundle_unittest.cc

Issue 611513003: Disable DelegateGetFontList test on Android through C++. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/gtest/filter/ui_unittests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_unittest.cc
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index 1a3d7be182524ff67fa86897b79dd5cef7c400d2..6a3f71e7c51269561faa32ee8babbf481a639c8e 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -342,7 +342,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
« no previous file with comments | « build/android/pylib/gtest/filter/ui_unittests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698