summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 19:08:33 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 19:08:33 +0000
commit6951903e93bc6b4eb1a3944b7b6851d891a6079a (patch)
tree35bd421cfcbbc6c22493f12dee4ded8123548adb
parent036394278256ac093cc93122b965ac41c3750c15 (diff)
downloadchromium_src-6951903e93bc6b4eb1a3944b7b6851d891a6079a.zip
chromium_src-6951903e93bc6b4eb1a3944b7b6851d891a6079a.tar.gz
chromium_src-6951903e93bc6b4eb1a3944b7b6851d891a6079a.tar.bz2
Disable flaky test PerformanceMonitorBrowserTest.DisableAndEnableExtensionEvent
TBR=rdevlin.cronin@chromium.org BUG=135037 Review URL: https://chromiumcodereview.appspot.com/10693029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144768 0039d316-1c4b-4281-b951-d872f2087c98
-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 6958582..b21f40d 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -160,7 +160,8 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, InstallExtensionEvent) {
// Test that PerformanceMonitor will correctly record events as an extension is
// disabled and enabled.
-IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest,
+// Test is flaky, see http://crbug.com/135037.
+IN_PROC_BROWSER_TEST_F(DISABLED_PerformanceMonitorBrowserTest,
DisableAndEnableExtensionEvent) {
const int kNumEvents = 3;