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

Unified Diff: ui/base/resource/resource_bundle.h

Issue 11358014: Cleanup resource_bundle_unittest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, fixed android unittest disabled Created 8 years, 1 month 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/gtest_filter/ui_unittests_disabled ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index d61d729bba44278dc3fe473d2020c2780036c7ff..de547fcabd796477070566ed0118b47b1ec59576 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -254,18 +254,12 @@ class UI_EXPORT ResourceBundle {
}
private:
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForResourcePack);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForLocalePack);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetImageNamed);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetNativeImageNamed);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateLoadDataResourceBytes);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetRawDataResource);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetLocalizedString);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetFont);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetRawDataResource);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LocaleDataPakExists);
- FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetImageNamed);
+ FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetPathForLocalePack);
+ FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetImageNamed);
+ FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetNativeImageNamed);
+
+ friend class ResourceBundleImageTest;
+ friend class ResourceBundleTest;
class ResourceBundleImageSource;
friend class ResourceBundleImageSource;
« no previous file with comments | « build/android/gtest_filter/ui_unittests_disabled ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698