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

Unified Diff: chrome/browser/chrome_browser_main.h

Issue 8677029: [ChromiumOS] Disable tests which were crashing on the waterfall. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | chrome/browser/chrome_browser_main_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 806af879149893c696445ecb0d2a27e8762ab735..7f40f357cb3d3ec9d331b4421843f9fc857d506e 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -165,9 +165,10 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
// Initialized in SetupMetricsAndFieldTrials.
scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
- FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket);
- FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Random);
- FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
+ FRIEND_TEST_ALL_PREFIXES(BrowserMainTest,
+ WarmConnectionFieldTrial_WarmestSocket);
+ FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Random);
+ FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
};
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698