summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorabodenha@google.com <abodenha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 21:58:05 +0000
committerabodenha@google.com <abodenha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 21:58:05 +0000
commit3b3e801cc7c807a5b7249add2a7be2ebc30e3e56 (patch)
treed49dd92a58b0f10331d7c240d02649fda79288a1 /chrome/browser/extensions
parentf71abe0e44cbb6c0b2168dcb13bfae1d8d45b153 (diff)
downloadchromium_src-3b3e801cc7c807a5b7249add2a7be2ebc30e3e56.zip
chromium_src-3b3e801cc7c807a5b7249add2a7be2ebc30e3e56.tar.gz
chromium_src-3b3e801cc7c807a5b7249add2a7be2ebc30e3e56.tar.bz2
Mark flaky test as flaky.
BUG=120762 TEST=None Review URL: https://chromiumcodereview.appspot.com/9885001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/content_script_apitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
index cba4f12..f6097ad 100644
--- a/chrome/browser/extensions/content_script_apitest.cc
+++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -80,8 +80,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptViewSource) {
ASSERT_TRUE(RunExtensionTest("content_scripts/view_source")) << message_;
}
+#if defined (OS_CHROMEOS)
+IN_PROC_BROWSER_TEST_F(
+ ExtensionApiTest,
+ FLAKY_ContentScriptStylesInjectedIntoExistingRenderers) {
+#else
IN_PROC_BROWSER_TEST_F(
ExtensionApiTest, ContentScriptStylesInjectedIntoExistingRenderers) {
+#endif
ASSERT_TRUE(StartTestServer());
ui_test_utils::WindowedNotificationObserver signal(