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

Unified Diff: chrome/browser/prefs/pref_hash_browsertest.cc

Issue 206513005: [ChromeOS] Disable PrefHash browser tests on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_hash_browsertest.cc
diff --git a/chrome/browser/prefs/pref_hash_browsertest.cc b/chrome/browser/prefs/pref_hash_browsertest.cc
index e954926c89f6a5c49f65256e832bf3545fe71c6a..0259e6edb85a9eb4b3b7bd82a79cf9564444e1a2 100644
--- a/chrome/browser/prefs/pref_hash_browsertest.cc
+++ b/chrome/browser/prefs/pref_hash_browsertest.cc
@@ -148,8 +148,19 @@ class PrefHashBrowserTest : public InProcessBrowserTest,
}
};
+#if defined(OS_CHROMEOS)
+// PrefHash service has been disabled on ChromeOS: crbug.com/343261
+#define MAYBE_PRE_PRE_InitializeUnloadedProfiles DISABLED_PRE_PRE_InitializeUnloadedProfiles
+#define MAYBE_PRE_InitializeUnloadedProfiles DISABLED_PRE_InitializeUnloadedProfiles
+#define MAYBE_InitializeUnloadedProfiles DISABLED_InitializeUnloadedProfiles
+#else
+#define MAYBE_PRE_PRE_InitializeUnloadedProfiles PRE_PRE_InitializeUnloadedProfiles
+#define MAYBE_PRE_InitializeUnloadedProfiles PRE_InitializeUnloadedProfiles
+#define MAYBE_InitializeUnloadedProfiles InitializeUnloadedProfiles
+#endif
+
IN_PROC_BROWSER_TEST_P(PrefHashBrowserTest,
- PRE_PRE_InitializeUnloadedProfiles) {
+ MAYBE_PRE_PRE_InitializeUnloadedProfiles) {
if (!profiles::IsMultipleProfilesEnabled())
return;
ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ -179,7 +190,7 @@ IN_PROC_BROWSER_TEST_P(PrefHashBrowserTest,
}
IN_PROC_BROWSER_TEST_P(PrefHashBrowserTest,
- PRE_InitializeUnloadedProfiles) {
+ MAYBE_PRE_InitializeUnloadedProfiles) {
if (!profiles::IsMultipleProfilesEnabled())
return;
@@ -216,7 +227,7 @@ IN_PROC_BROWSER_TEST_P(PrefHashBrowserTest,
}
IN_PROC_BROWSER_TEST_P(PrefHashBrowserTest,
- InitializeUnloadedProfiles) {
+ MAYBE_InitializeUnloadedProfiles) {
if (!profiles::IsMultipleProfilesEnabled())
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698