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

Unified Diff: chrome/browser/profiles/profile_info_cache_unittest.cc

Issue 8566037: aura: Fix unit_tests on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 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 | « base/message_pump_x.cc ('k') | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_info_cache_unittest.cc
diff --git a/chrome/browser/profiles/profile_info_cache_unittest.cc b/chrome/browser/profiles/profile_info_cache_unittest.cc
index 79690122c2e8b7e0d1d0311a9b15e6f67b77c8a4..83aeff143a8dfbe1dd49f64715e6e7577e2ebea5 100644
--- a/chrome/browser/profiles/profile_info_cache_unittest.cc
+++ b/chrome/browser/profiles/profile_info_cache_unittest.cc
@@ -299,13 +299,7 @@ TEST_F(ProfileInfoCacheTest, GAIAPicture) {
profile_image, GetCache()->GetAvatarIconOfProfileAtIndex(1)));
}
-#if defined(USE_AURA)
-#define MAYBE_PersistGAIAPicture DISABLED_PersistGAIAPicture
-#else
-#define MAYBE_PersistGAIAPicture PersistGAIAPicture
-#endif
-
-TEST_F(ProfileInfoCacheTest, MAYBE_PersistGAIAPicture) {
+TEST_F(ProfileInfoCacheTest, PersistGAIAPicture) {
GetCache()->AddProfileToCache(
GetProfilePath("path_1"), ASCIIToUTF16("name_1"), string16(), 0);
gfx::Image gaia_image(gfx::test::CreateImage());
« no previous file with comments | « base/message_pump_x.cc ('k') | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698