summaryrefslogtreecommitdiffstats
path: root/chrome/browser/performance_monitor
diff options
context:
space:
mode:
authorygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-12 10:48:06 +0000
committerygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-12 10:48:06 +0000
commit28c0e3c5675c7945d68be65b90f2ce32207e76b9 (patch)
treeccd5f4b323a89e24de8ee116b06dd55bf8a92212 /chrome/browser/performance_monitor
parent88c023a078b011f9f46258b33c379f6d1b5e512e (diff)
downloadchromium_src-28c0e3c5675c7945d68be65b90f2ce32207e76b9.zip
chromium_src-28c0e3c5675c7945d68be65b90f2ce32207e76b9.tar.gz
chromium_src-28c0e3c5675c7945d68be65b90f2ce32207e76b9.tar.bz2
PerformanceMonitorBrowserTest.GatherStatistics marked as FLAKY.
BUG=160502 TBR=mitchellwrosen@chromium.org Review URL: https://codereview.chromium.org/11358196 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor')
-rw-r--r--chrome/browser/performance_monitor/performance_monitor_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index e16558f..2ddf6c3 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -551,7 +551,8 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, NewVersionEvent) {
ASSERT_EQ(version_string, current_version);
}
-IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, GatherStatistics) {
+// crbug.com/160502
+IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, FLAKY_GatherStatistics) {
GatherStatistics();
// No stats should be recorded for this CPUUsage because this was the first