diff options
| author | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 21:50:35 +0000 |
|---|---|---|
| committer | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 21:50:35 +0000 |
| commit | 76daf5d1a50e36cd0f91279779fc4f15ce1d30da (patch) | |
| tree | d7fc7fbe317a515d9450e10bb4f56dd4f15bbeaf | |
| parent | 69eb9112f4f5ea2519097066d6c97d0597a757b5 (diff) | |
| download | chromium_src-76daf5d1a50e36cd0f91279779fc4f15ce1d30da.zip chromium_src-76daf5d1a50e36cd0f91279779fc4f15ce1d30da.tar.gz chromium_src-76daf5d1a50e36cd0f91279779fc4f15ce1d30da.tar.bz2 | |
Roll WebKit 100977:101017.
Mark as always-failing two already-flaky inspector tests after WebKit r100991.
BUG=89845,100538
TBR=koz
Review URL: http://codereview.chromium.org/8642003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111224 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -5,7 +5,7 @@ vars = { "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "100977", + "webkit_revision": "101017", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", "nacl_revision": "7169", diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index ee394f7..f289406 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -541,7 +541,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { #if defined(OS_MACOSX) #define MAYBE_InspectSharedWorker DISABLED_InspectSharedWorker #else -#define MAYBE_InspectSharedWorker InspectSharedWorker +#define MAYBE_InspectSharedWorker FAILS_InspectSharedWorker #endif // Flakily fails with 25s timeout: http://crbug.com/89845 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) { @@ -551,10 +551,8 @@ IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) { // http://crbug.com/100538 #if defined(OS_MACOSX) #define MAYBE_PauseInSharedWorkerInitialization DISABLED_PauseInSharedWorkerInitialization -#elif defined(OS_WIN) -#define MAYBE_PauseInSharedWorkerInitialization FLAKY_PauseInSharedWorkerInitialization #else -#define MAYBE_PauseInSharedWorkerInitialization PauseInSharedWorkerInitialization +#define MAYBE_PauseInSharedWorkerInitialization FAILS_PauseInSharedWorkerInitialization #endif // See http://crbug.com/100538 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, |